diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2023-03-13 10:56:24 +0000 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2023-03-14 05:51:33 +0000 |
| commit | 7034f5e54ba54ac4ec7dea6d97d20a00cd4e334f (patch) | |
| tree | 492c39c4257c97926930d7a79fa3fa2b670b15e3 | |
| parent | 5a3e96a0b96d89e8b4951701bfbe0f25036536b5 (diff) | |
| download | ports-7034f5e54ba54ac4ec7dea6d97d20a00cd4e334f.tar.gz ports-7034f5e54ba54ac4ec7dea6d97d20a00cd4e334f.zip | |
www/iridium: update to 2023.03.111
Approved by: rene (mentor)
531 files changed, 3788 insertions, 2617 deletions
diff --git a/www/iridium/Makefile b/www/iridium/Makefile index 15edf1f99c45..760eac6e736e 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -1,6 +1,5 @@ PORTNAME= iridium -PORTVERSION= 2023.01.109 -PORTREVISION= 1 +PORTVERSION= 2023.03.111 CATEGORIES= www wayland MASTER_SITES= https://downloads.iridiumbrowser.de/source/ PKGNAMESUFFIX= -browser @@ -16,7 +15,7 @@ LICENSE_COMB= multi ONLY_FOR_ARCHS= aarch64 amd64 i386 PATCH_SITES= https://nerd.hu/distfiles/ -PATCHFILES+= disable-privacy-sandbox-7f49edb924b6d2b38fcc9a2c76d4e5e1f857e7b9.patch:-p1 +PATCHFILES+= disable-privacy-sandbox-ce036275d9d21a8408ef48ee9839b3c21b8448ca.patch:-p1 BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ @@ -42,7 +41,9 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \ libspeex.so:audio/speex \ 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 \ libpci.so:devel/libpci \ @@ -119,9 +120,8 @@ GN_ARGS+= clang_use_chrome_plugins=false \ use_sysroot=false \ use_system_freetype=false \ use_system_harfbuzz=true \ + use_system_libffi=true \ use_system_libjpeg=true \ - use_system_libwayland=true \ - use_system_wayland_scanner=true \ use_udev=false \ extra_cxxflags="${CXXFLAGS}" \ extra_ldflags="${LDFLAGS}" diff --git a/www/iridium/distinfo b/www/iridium/distinfo index c328a5d3594d..8edaa0767931 100644 --- a/www/iridium/distinfo +++ b/www/iridium/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1673979574 -SHA256 (iridium-browser-2023.01.109.tar.xz) = fb7612c88d0b997c51d427691f55d284369f2155d1a97ebca872c94ea8c93ac0 -SIZE (iridium-browser-2023.01.109.tar.xz) = 1497700992 -SHA256 (disable-privacy-sandbox-7f49edb924b6d2b38fcc9a2c76d4e5e1f857e7b9.patch) = 946f281504f7ce775a288f7d82371c2479d39e2e6c238f779aeeba1b821cbf07 -SIZE (disable-privacy-sandbox-7f49edb924b6d2b38fcc9a2c76d4e5e1f857e7b9.patch) = 4702 +TIMESTAMP = 1678693399 +SHA256 (iridium-browser-2023.03.111.tar.xz) = 418395ea49900434fdecfc7f202f3e157f0f8fee639f6ca676bc88549f4eb16c +SIZE (iridium-browser-2023.03.111.tar.xz) = 1486956168 +SHA256 (disable-privacy-sandbox-ce036275d9d21a8408ef48ee9839b3c21b8448ca.patch) = c8cc1c6a6f735adfe807da0109349ebab87e0eff77f593925757da34bb31f38c +SIZE (disable-privacy-sandbox-ce036275d9d21a8408ef48ee9839b3c21b8448ca.patch) = 4177 diff --git a/www/iridium/files/patch-BUILD.gn b/www/iridium/files/patch-BUILD.gn index 0a950495a8b9..21bd3cc295ef 100644 --- a/www/iridium/files/patch-BUILD.gn +++ b/www/iridium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2023-01-17 19:19:00 UTC +--- BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ BUILD.gn @@ -60,7 +60,7 @@ declare_args() { root_extra_deps = [] @@ -17,8 +17,8 @@ "//net:net_unittests", "//sandbox:sandbox_unittests", "//services:services_unittests", -@@ -434,7 +433,7 @@ group("gn_all") { - ] +@@ -417,7 +416,7 @@ group("gn_all") { + } } - if (is_linux || is_chromeos || is_android) { @@ -26,8 +26,8 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -637,6 +636,15 @@ group("gn_all") { - deps += [ "//gpu/tools/compositor_model_bench" ] +@@ -616,6 +615,15 @@ group("gn_all") { + } } + if (is_bsd) { @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:crash_inspector", -@@ -685,7 +693,7 @@ group("gn_all") { +@@ -664,7 +672,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -51,7 +51,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -1115,7 +1123,7 @@ if (!is_ios) { +@@ -1086,7 +1094,7 @@ if (!is_ios) { ] } @@ -60,7 +60,7 @@ # WPT Webdriver tests runner # chrome/test/chromedriver/test/run_webdriver_tests.py script_test("webdriver_wpt_tests") { -@@ -1211,7 +1219,7 @@ if (!is_ios) { +@@ -1186,7 +1194,7 @@ if (!is_ios) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -69,7 +69,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1220,7 +1228,7 @@ if (!is_ios) { +@@ -1195,7 +1203,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -78,7 +78,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1660,7 +1668,7 @@ group("chromium_builder_perf") { +@@ -1661,7 +1669,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 51e6d1c603b0..98ea2f9c3e99 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 2023-01-17 19:19:00 UTC +--- base/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ base/BUILD.gn -@@ -167,7 +167,7 @@ buildflag_header("ios_cronet_buildflags") { +@@ -168,7 +168,7 @@ buildflag_header("ios_cronet_buildflags") { flags = [ "CRONET_BUILD=$is_cronet_build" ] } @@ -9,7 +9,7 @@ buildflag_header("message_pump_buildflags") { header = "message_pump_buildflags.h" header_dir = "base/message_loop" -@@ -1059,7 +1059,7 @@ mixed_component("base") { +@@ -1053,7 +1053,7 @@ component("base") { "timer/hi_res_timer_manager_posix.cc", ] @@ -18,7 +18,7 @@ sources += [ "profiler/stack_base_address_posix.cc", "profiler/stack_base_address_posix.h", -@@ -1070,6 +1070,14 @@ mixed_component("base") { +@@ -1064,6 +1064,14 @@ component("base") { "profiler/thread_delegate_posix.h", ] } @@ -33,7 +33,7 @@ } if (is_win) { -@@ -1569,11 +1577,23 @@ mixed_component("base") { +@@ -1544,11 +1552,23 @@ component("base") { # Needed for <atomic> if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -58,7 +58,7 @@ if (use_allocator_shim) { sources += [ "allocator/partition_allocator/shim/allocator_shim.cc", -@@ -1601,7 +1621,7 @@ mixed_component("base") { +@@ -1576,7 +1596,7 @@ component("base") { ] configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ] } @@ -67,7 +67,7 @@ sources += [ "allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h", "allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h", -@@ -1655,7 +1675,7 @@ mixed_component("base") { +@@ -1617,7 +1637,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -76,7 +76,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2238,6 +2258,41 @@ mixed_component("base") { +@@ -2208,6 +2228,39 @@ component("base") { } } @@ -84,7 +84,6 @@ + sources -= [ + "files/file_path_watcher_inotify.cc", + "files/scoped_file_linux.cc", -+ "process/memory_linux.cc", + "process/process_linux.cc", + "system/sys_info_linux.cc", + "process/process_iterator_linux.cc", @@ -92,7 +91,6 @@ + "process/process_handle_linux.cc" + ] + sources += [ -+ "process/memory_stubs.cc", + "files/file_path_watcher_kqueue.cc", + "files/file_path_watcher_kqueue.h", + "files/file_path_watcher_bsd.cc", @@ -118,7 +116,7 @@ # iOS if (is_ios) { sources -= [ -@@ -2335,7 +2390,7 @@ mixed_component("base") { +@@ -2303,7 +2356,7 @@ component("base") { } if (dep_libevent) { @@ -127,7 +125,7 @@ } if (use_libevent) { -@@ -3605,7 +3660,7 @@ test("base_unittests") { +@@ -3556,7 +3609,7 @@ test("base_unittests") { } } @@ -136,7 +134,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3651,7 +3706,7 @@ test("base_unittests") { +@@ -3602,7 +3655,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -145,7 +143,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3662,7 +3717,7 @@ test("base_unittests") { +@@ -3613,7 +3666,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -154,7 +152,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3869,7 +3924,7 @@ test("base_unittests") { +@@ -3829,7 +3882,7 @@ test("base_unittests") { } } diff --git a/www/iridium/files/patch-base_allocator_dispatcher_tls.h b/www/iridium/files/patch-base_allocator_dispatcher_tls.h new file mode 100644 index 000000000000..f2d8b63ecc1a --- /dev/null +++ b/www/iridium/files/patch-base_allocator_dispatcher_tls.h @@ -0,0 +1,11 @@ +--- base/allocator/dispatcher/tls.h.orig 2023-03-13 07:33:08 UTC ++++ base/allocator/dispatcher/tls.h +@@ -51,7 +51,7 @@ struct BASE_EXPORT MMapAllocator { + partition_alloc::PartitionPageSize(); + #elif BUILDFLAG(IS_APPLE) + constexpr static size_t AllocationChunkSize = 16384; +-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) ++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) + constexpr static size_t AllocationChunkSize = 16384; + #else + constexpr static size_t AllocationChunkSize = 4096; diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_address__space__randomization.h b/www/iridium/files/patch-base_allocator_partition__allocator_address__space__randomization.h index bd62431db8a9..767a8d42627a 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_address__space__randomization.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_address__space__randomization.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/address_space_randomization.h.orig 2022-10-05 07:34:01 UTC +--- base/allocator/partition_allocator/address_space_randomization.h.orig 2023-03-13 07:33:08 UTC +++ base/allocator/partition_allocator/address_space_randomization.h @@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) { @@ -9,7 +9,7 @@ // We shouldn't allocate system pages at all for sanitizer builds. However, // we do, and if random hint addresses interfere with address ranges -@@ -128,7 +128,7 @@ AslrMask(uintptr_t bits) { +@@ -124,7 +124,7 @@ AslrMask(uintptr_t bits) { return AslrAddress(0x20000000ULL); } diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h index 27cc5254df40..2aaad3177108 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,8 +1,8 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-01-17 19:19:00 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-03-13 07:33:08 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -370,8 +370,12 @@ bool TryRecommitSystemPagesInternal( - +@@ -371,8 +371,12 @@ bool TryRecommitSystemPagesInternal( void DiscardSystemPagesInternal(uintptr_t address, size_t length) { + #if !BUILDFLAG(IS_NACL) void* ptr = reinterpret_cast<void*>(address); -#if BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__address__space.cc b/www/iridium/files/patch-base_allocator_partition__allocator_partition__address__space.cc index 94938325934f..1cf587ec7e13 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__address__space.cc +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__address__space.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-01-17 19:19:00 UTC +--- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-03-13 07:33:08 UTC +++ base/allocator/partition_allocator/partition_address_space.cc -@@ -432,7 +432,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting() +@@ -416,7 +416,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting() } #endif 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 3a1491c7daa8..b7a246e141e2 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,7 +1,7 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-01-17 19:19:00 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-03-13 07:33:08 UTC +++ base/allocator/partition_allocator/partition_alloc.gni -@@ -121,7 +121,7 @@ assert( - "Missing dangling pointer checks feature for its performance experiment") +@@ -233,7 +233,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt + "AsanBackupRefPtr requires RawPtrHookableImpl") declare_args() { - enable_pkeys = is_linux && target_cpu == "x64" diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h index c39f37a5bf4b..50dbbda3431b 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h @@ -1,29 +1,29 @@ ---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-01-17 19:19:00 UTC +--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-03-13 07:33:08 UTC +++ base/allocator/partition_allocator/partition_alloc_config.h -@@ -84,7 +84,7 @@ static_assert(sizeof(void*) != 8, ""); - +@@ -120,7 +120,7 @@ static_assert(sizeof(void*) != 8, ""); // POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific // features such as futex(2). --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - #define PA_HAS_LINUX_KERNEL - #endif - -@@ -216,7 +216,7 @@ constexpr bool kUseLazyCommit = false; + #define PA_CONFIG_HAS_LINUX_KERNEL() \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)) + // On some platforms, we implement locking by spinning in userspace, then going + // into the kernel only if there is contention. This requires platform support, +@@ -267,7 +267,7 @@ constexpr bool kUseLazyCommit = false; // On these platforms, lock all the partitions before fork(), and unlock after. // This may be required on more platforms in the future. --#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #define PA_HAS_ATFORK_HANDLER - #endif + #define PA_CONFIG_HAS_ATFORK_HANDLER() \ +- (BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++ (BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) -@@ -257,7 +257,7 @@ constexpr bool kUseLazyCommit = false; - // + // PartitionAlloc uses PartitionRootEnumerator to acquire all + // PartitionRoots at BeforeFork and to release at AfterFork. +@@ -312,7 +312,7 @@ constexpr bool kUseLazyCommit = false; // Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to // larger slot spans. --#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) -+#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD) - #define PA_PREFER_SMALLER_SLOT_SPANS - #endif // BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) + #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() \ +- (BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64))) ++ (BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD)) + // Enable shadow metadata. + // diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h index 7a3886aa985d..ef52dd50d512 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-01-17 19:19:00 UTC +--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-03-13 07:33:08 UTC +++ base/allocator/partition_allocator/partition_alloc_constants.h @@ -91,7 +91,7 @@ PartitionPageShift() { return 18; // 256 KiB @@ -9,12 +9,12 @@ PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t PartitionPageShift() { return PageAllocationGranularityShift() + 2; -@@ -274,7 +274,7 @@ constexpr size_t kNumPools = 3; - // Special-case Android and iOS, which incur test failures with larger - // pools. Regardless, allocating >8GiB with malloc() on these platforms is - // unrealistic as of 2022. --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) +@@ -277,7 +277,7 @@ constexpr size_t kNumPools = 3; + // + // When pointer compression is enabled, we cannot use large pools (at most + // 8GB for each of the glued pools). +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION) || BUILDFLAG(IS_BSD) constexpr size_t kPoolMaxSize = 8 * kGiB; #else constexpr size_t kPoolMaxSize = 16 * kGiB; diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__forward.h b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__forward.h index d2bd4a2be37a..6e2c2f9b16c5 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__forward.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__forward.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc_forward.h.orig 2022-12-01 10:35:46 UTC +--- base/allocator/partition_allocator/partition_alloc_forward.h.orig 2023-03-13 07:33:08 UTC +++ base/allocator/partition_allocator/partition_alloc_forward.h -@@ -25,9 +25,13 @@ namespace internal { +@@ -27,9 +27,13 @@ namespace internal { // the second one 16. We could technically return something different for // malloc() and operator new(), but this would complicate things, and most of // our allocations are presumably coming from operator new() anyway. diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc b/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc index 77eb2accd264..0ef3cc09ee2a 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_root.cc.orig 2023-01-17 19:19:00 UTC +--- base/allocator/partition_allocator/partition_root.cc.orig 2023-03-13 07:33:08 UTC +++ base/allocator/partition_allocator/partition_root.cc @@ -42,7 +42,7 @@ #include "wow64apiset.h" @@ -9,16 +9,16 @@ #include <pthread.h> #endif -@@ -239,7 +239,7 @@ void PartitionAllocMallocInitOnce() { - if (!g_global_init_called.compare_exchange_strong(expected, true)) +@@ -245,7 +245,7 @@ void PartitionAllocMallocInitOnce() { return; + } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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. -@@ -332,7 +332,7 @@ static size_t PartitionPurgeSlotSpan( +@@ -339,7 +339,7 @@ static size_t PartitionPurgeSlotSpan( constexpr size_t kMaxSlotCount = (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) / MinPurgeableSlotSize(); @@ -27,7 +27,7 @@ // It's better for slot_usage to be stack-allocated and fixed-size, which // demands that its size be constexpr. On IS_APPLE and Linux on arm64, // PartitionPageSize() is always SystemPageSize() << 2, so regardless of -@@ -789,7 +789,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions +@@ -800,7 +800,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions // apple OSes. PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || (internal::SystemPageSize() == (size_t{1} << 14))); diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc b/www/iridium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc index d5db4456a6fe..bc29b3eef37b 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc +++ b/www/iridium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc @@ -1,10 +1,11 @@ ---- base/allocator/partition_allocator/spinning_mutex.cc.orig 2022-10-05 07:34:01 UTC +--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2023-03-13 07:33:08 UTC +++ base/allocator/partition_allocator/spinning_mutex.cc -@@ -18,7 +18,15 @@ +@@ -18,7 +18,16 @@ - #if defined(PA_HAS_LINUX_KERNEL) + #if PA_CONFIG(HAS_LINUX_KERNEL) #include <errno.h> +#if defined(OS_OPENBSD) ++#include <sys/time.h> +#include <sys/futex.h> +#elif defined(OS_FREEBSD) +#include <sys/types.h> @@ -15,14 +16,17 @@ +#endif #include <sys/syscall.h> #include <unistd.h> - #endif // defined(PA_HAS_LINUX_KERNEL) -@@ -107,8 +115,13 @@ void SpinningMutex::FutexWait() { + #endif // PA_CONFIG(HAS_LINUX_KERNEL) +@@ -107,8 +116,16 @@ void SpinningMutex::FutexWait() { // |kLockedContended| anymore. Note that even without spurious wakeups, the // value of |state_| is not guaranteed when this returns, as another thread // may get the lock before we get to run. +#if defined(OS_FREEBSD) + int err = _umtx_op(&state_, UMTX_OP_WAIT_UINT_PRIVATE, + kLockedContended, nullptr, nullptr); ++#elif defined(OS_OPENBSD) ++ int err = futex(reinterpret_cast<volatile unsigned int *>(&state_), FUTEX_WAIT | FUTEX_PRIVATE_FLAG, ++ kLockedContended, nullptr, nullptr); +#else int err = syscall(SYS_futex, &state_, FUTEX_WAIT | FUTEX_PRIVATE_FLAG, kLockedContended, nullptr, nullptr, 0); @@ -30,18 +34,20 @@ if (err) { // These are programming error, check them. -@@ -120,8 +133,14 @@ void SpinningMutex::FutexWait() { +@@ -120,8 +137,16 @@ void SpinningMutex::FutexWait() { void SpinningMutex::FutexWake() { int saved_errno = errno; +#if defined(OS_FREEBSD) + long retval = _umtx_op(&state_, UMTX_OP_WAKE_PRIVATE, + 1 /* wake up a single waiter */, nullptr, nullptr); ++#elif defined(OS_OPENBSD) ++ long retval = futex(reinterpret_cast<volatile unsigned int *>(&state_), FUTEX_WAKE | FUTEX_PRIVATE_FLAG, ++ 1 /* wake up a single waiter */, nullptr, nullptr); +#else long retval = syscall(SYS_futex, &state_, FUTEX_WAKE | FUTEX_PRIVATE_FLAG, 1 /* wake up a single waiter */, nullptr, nullptr, 0); +#endif -+ PA_CHECK(retval != -1); errno = saved_errno; } diff --git a/www/iridium/files/patch-base_debug_stack__trace.cc b/www/iridium/files/patch-base_debug_stack__trace.cc new file mode 100644 index 000000000000..8471ed9a1d1c --- /dev/null +++ b/www/iridium/files/patch-base_debug_stack__trace.cc @@ -0,0 +1,21 @@ +--- base/debug/stack_trace.cc.orig 2023-03-13 07:33:08 UTC ++++ base/debug/stack_trace.cc +@@ -273,7 +273,9 @@ void StackTrace::Print() const { + } + + void StackTrace::OutputToStream(std::ostream* os) const { ++#if !BUILDFLAG(IS_BSD) + OutputToStreamWithPrefix(os, nullptr); ++#endif + } + + std::string StackTrace::ToString() const { +@@ -281,7 +283,7 @@ std::string StackTrace::ToString() const { + } + std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { + std::stringstream stream; +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD) + OutputToStreamWithPrefix(&stream, prefix_string); + #endif + return stream.str(); 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 683bd2b2ae1f..c8f968e6611e 100644 --- a/www/iridium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/iridium/files/patch-base_debug_stack__trace__posix.cc @@ -1,6 +1,15 @@ ---- base/debug/stack_trace_posix.cc.orig 2022-12-01 10:35:46 UTC +--- base/debug/stack_trace_posix.cc.orig 2023-03-13 07:33:08 UTC +++ base/debug/stack_trace_posix.cc -@@ -39,7 +39,7 @@ +@@ -40,7 +40,7 @@ + // execinfo.h and backtrace(3) are really only present in glibc and in macOS + // libc. + #if BUILDFLAG(IS_APPLE) || \ +- (defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(__AIX)) ++ (defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(__AIX) && !BUILDFLAG(IS_BSD)) + #define HAVE_BACKTRACE + #include <execinfo.h> + #endif +@@ -58,7 +58,7 @@ #include <AvailabilityMacros.h> #endif @@ -9,7 +18,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -699,6 +699,9 @@ class SandboxSymbolizeHelper { +@@ -761,6 +761,9 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -19,7 +28,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -716,6 +719,7 @@ class SandboxSymbolizeHelper { +@@ -778,6 +781,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; @@ -27,12 +36,3 @@ } // Opens all object files and caches their file descriptors. -@@ -872,7 +876,7 @@ size_t CollectStackTrace(void** trace, size_t count) { - // If we do not have unwind tables, then try tracing using frame pointers. - return base::debug::TraceStackFramePointers(const_cast<const void**>(trace), - count, 0); --#elif !defined(__UCLIBC__) && !defined(_AIX) -+#elif !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD) - // Though the backtrace API man page does not list any possible negative - // return values, we take no chance. - return base::saturated_cast<size_t>( diff --git a/www/iridium/files/patch-base_files_file__path__watcher.h b/www/iridium/files/patch-base_files_file__path__watcher.h new file mode 100644 index 000000000000..bfa4562a7d75 --- /dev/null +++ b/www/iridium/files/patch-base_files_file__path__watcher.h @@ -0,0 +1,11 @@ +--- base/files/file_path_watcher.h.orig 2023-03-13 07:33:08 UTC ++++ base/files/file_path_watcher.h +@@ -59,7 +59,7 @@ class BASE_EXPORT FilePathWatcher { + Type type = Type::kNonRecursive; + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + // The callback will return the full path to a changed file instead of + // the watched path supplied as |path| when Watch is called. + // So the full path can be different from the watched path when a folder is diff --git a/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc b/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc index ffb671dbc74b..0b1ea63389a9 100644 --- a/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc +++ b/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc @@ -1,15 +1,15 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2022-10-05 07:34:01 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2023-03-13 07:33:08 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -498,7 +498,7 @@ TEST_F(FilePathWatcherTest, MAYBE_WatchDirectory) { +@@ -521,7 +521,7 @@ TEST_F(FilePathWatcherTest, MAYBE_WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; - ASSERT_TRUE(WaitForEvents()); + ASSERT_TRUE(WaitForEvent()); -#if !BUILDFLAG(IS_APPLE) +#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) // Mac implementation does not detect files modified in a directory. ASSERT_TRUE(WriteFile(file1, "content v2")); VLOG(1) << "Waiting for file1 modification"; -@@ -1118,7 +1118,7 @@ enum Permission { +@@ -1345,7 +1345,7 @@ enum Permission { Execute }; @@ -18,7 +18,7 @@ bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -1149,7 +1149,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -1376,7 +1376,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi } #endif // BUILDFLAG(IS_APPLE) 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 b380b6ad3831..36907a74a84a 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 2023-01-17 19:19:00 UTC +--- base/files/file_util_unittest.cc.orig 2023-03-13 07:33:08 UTC +++ base/files/file_util_unittest.cc -@@ -3558,7 +3558,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3749,7 +3749,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"; -@@ -4281,7 +4281,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles +@@ -4472,7 +4472,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 new file mode 100644 index 000000000000..b8fd9eb21ddb --- /dev/null +++ b/www/iridium/files/patch-base_functional_unretained__traits.h @@ -0,0 +1,11 @@ +--- base/functional/unretained_traits.h.orig 2023-03-13 07:33:08 UTC ++++ base/functional/unretained_traits.h +@@ -130,7 +130,7 @@ struct TypeSupportsUnretained { + // official builds, and then in non-test code as well. + #if !defined(UNIT_TEST) && !defined(OFFICIAL_BUILD) + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ +- defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS) ++ || BUILDFLAGS(IS_BSD) || defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS) + static_assert(IsCompleteTypeV<T> || + IsIncompleteTypeSafeForUnretained<std::remove_cv_t<T>>, + "T must be fully defined."); diff --git a/www/iridium/files/patch-base_i18n_icu__util.cc b/www/iridium/files/patch-base_i18n_icu__util.cc index de9d5f533054..1cdc91d0f16f 100644 --- a/www/iridium/files/patch-base_i18n_icu__util.cc +++ b/www/iridium/files/patch-base_i18n_icu__util.cc @@ -1,6 +1,6 @@ ---- base/i18n/icu_util.cc.orig 2022-12-06 08:09:13 UTC +--- base/i18n/icu_util.cc.orig 2023-03-13 07:33:08 UTC +++ base/i18n/icu_util.cc -@@ -52,7 +52,7 @@ +@@ -51,7 +51,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" #endif @@ -9,7 +9,7 @@ BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -343,7 +343,7 @@ void InitializeIcuTimeZone() { +@@ -340,7 +340,7 @@ void InitializeIcuTimeZone() { FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); diff --git a/www/iridium/files/patch-base_logging__unittest.cc b/www/iridium/files/patch-base_logging__unittest.cc index 3f34caa60e49..fd742f644307 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 2022-10-05 07:34:01 UTC +--- base/logging_unittest.cc.orig 2023-03-13 07:33:08 UTC +++ base/logging_unittest.cc @@ -32,7 +32,7 @@ #include "base/posix/eintr_wrapper.h" @@ -9,7 +9,7 @@ #include <ucontext.h> #endif -@@ -574,14 +574,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -575,14 +575,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_platform__shared__memory__region__posix.cc b/www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc index 7de0fcfe7f22..9be8fe7bf885 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,4 +1,4 @@ ---- base/memory/platform_shared_memory_region_posix.cc.orig 2022-10-05 07:34:01 UTC +--- base/memory/platform_shared_memory_region_posix.cc.orig 2023-03-13 07:33:08 UTC +++ base/memory/platform_shared_memory_region_posix.cc @@ -55,7 +55,7 @@ bool CheckFDAccessMode(int fd, int expected_mode) { @@ -9,7 +9,7 @@ // static ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { PlatformSharedMemoryRegion region = -@@ -171,7 +171,7 @@ bool PlatformSharedMemoryRegion::ConvertToUnsafe() { +@@ -168,7 +168,7 @@ bool PlatformSharedMemoryRegion::ConvertToUnsafe() { // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, size_t size @@ -18,7 +18,7 @@ , bool executable #endif -@@ -200,7 +200,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: +@@ -197,7 +197,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: // flag. FilePath directory; if (!GetShmemTempDir( diff --git a/www/iridium/files/patch-base_posix_unix__domain__socket__unittest.cc b/www/iridium/files/patch-base_posix_unix__domain__socket__unittest.cc index 6a3c23f656e5..814adc5174de 100644 --- a/www/iridium/files/patch-base_posix_unix__domain__socket__unittest.cc +++ b/www/iridium/files/patch-base_posix_unix__domain__socket__unittest.cc @@ -1,4 +1,4 @@ ---- base/posix/unix_domain_socket_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- base/posix/unix_domain_socket_unittest.cc.orig 2023-03-13 07:33:08 UTC +++ base/posix/unix_domain_socket_unittest.cc @@ -10,6 +10,8 @@ #include <sys/types.h> @@ -6,6 +6,6 @@ +#include <signal.h> + - #include "base/bind.h" - #include "base/callback_helpers.h" #include "base/files/file_util.h" + #include "base/files/scoped_file.h" + #include "base/functional/bind.h" diff --git a/www/iridium/files/patch-base_process_memory.cc b/www/iridium/files/patch-base_process_memory.cc deleted file mode 100644 index 6d4798bff6fb..000000000000 --- a/www/iridium/files/patch-base_process_memory.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/process/memory.cc.orig 2023-01-17 19:19:00 UTC -+++ base/process/memory.cc -@@ -28,7 +28,7 @@ namespace base { - // Defined in memory_mac.mm for macOS + use_partition_alloc_as_malloc=false. - // In case of use_partition_alloc_as_malloc=true, no need to route the call to - // the system default calloc of macOS. --#if !BUILDFLAG(IS_APPLE) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) -+#if (!BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) - - bool UncheckedCalloc(size_t num_items, size_t size, void** result) { - const size_t alloc_size = num_items * size; diff --git a/www/iridium/files/patch-base_process_memory__linux.cc b/www/iridium/files/patch-base_process_memory__linux.cc new file mode 100644 index 000000000000..8e2512241d51 --- /dev/null +++ b/www/iridium/files/patch-base_process_memory__linux.cc @@ -0,0 +1,44 @@ +--- base/process/memory_linux.cc.orig 2023-03-13 07:33:08 UTC ++++ base/process/memory_linux.cc +@@ -20,6 +20,7 @@ + + namespace base { + ++#if !BUILDFLAG(IS_BSD) + namespace { + + void ReleaseReservationOrTerminate() { +@@ -29,12 +30,14 @@ void ReleaseReservationOrTerminate() { + } + + } // namespace ++#endif + + void EnableTerminationOnHeapCorruption() { + // On Linux, there nothing to do AFAIK. + } + + void EnableTerminationOnOutOfMemory() { ++#if !BUILDFLAG(IS_BSD) + // Set the new-out of memory handler. + std::set_new_handler(&ReleaseReservationOrTerminate); + // If we're using glibc's allocator, the above functions will override +@@ -43,8 +46,10 @@ void EnableTerminationOnOutOfMemory() { + #if BUILDFLAG(USE_ALLOCATOR_SHIM) + allocator_shim::SetCallNewHandlerOnMallocFailure(true); + #endif ++#endif + } + ++#if !BUILDFLAG(IS_BSD) + // ScopedAllowBlocking() has private constructor and it can only be used in + // friend classes/functions. Declaring a class is easier in this situation to + // avoid adding more dependency to thread_restrictions.h because of the +@@ -104,6 +109,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr + bool AdjustOOMScore(ProcessId process, int score) { + return AdjustOOMScoreHelper::AdjustOOMScore(process, score); + } ++#endif + + bool UncheckedMalloc(size_t size, void** result) { + #if BUILDFLAG(USE_ALLOCATOR_SHIM) diff --git a/www/iridium/files/patch-base_process_process__metrics.cc b/www/iridium/files/patch-base_process_process__metrics.cc index 425a1d44a126..3f47355d36c8 100644 --- a/www/iridium/files/patch-base_process_process__metrics.cc +++ b/www/iridium/files/patch-base_process_process__metrics.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics.cc.orig 2023-01-17 19:19:00 UTC +--- base/process/process_metrics.cc.orig 2023-03-13 07:33:08 UTC +++ base/process/process_metrics.cc @@ -17,7 +17,7 @@ namespace base { namespace { @@ -18,16 +18,16 @@ GetSystemMemoryInfo(&system_metrics.memory_info_); GetVmStatInfo(&system_metrics.vmstat_info_); GetSystemDiskInfo(&system_metrics.disk_info_); -@@ -73,7 +73,7 @@ Value SystemMetrics::ToValue() const { - Value res(Value::Type::DICTIONARY); +@@ -73,7 +73,7 @@ Value::Dict SystemMetrics::ToDict() const { + Value::Dict res; - res.SetIntKey("committed_memory", static_cast<int>(committed_memory_)); + res.Set("committed_memory", static_cast<int>(committed_memory_)); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - Value meminfo = memory_info_.ToValue(); - Value vmstat = vmstat_info_.ToValue(); - meminfo.MergeDictionary(&vmstat); -@@ -99,7 +99,6 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create + Value::Dict meminfo = memory_info_.ToDict(); + meminfo.Merge(vmstat_info_.ToDict()); + res.Set("meminfo", std::move(meminfo)); +@@ -98,7 +98,6 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create #endif // !BUILDFLAG(IS_MAC) } @@ -35,7 +35,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( TimeDelta cumulative_cpu) { TimeTicks time = TimeTicks::Now(); -@@ -125,7 +124,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( +@@ -124,7 +123,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( double ProcessMetrics::GetPlatformIndependentCPUUsage() { return GetPlatformIndependentCPUUsage(GetCumulativeCPUUsage()); } @@ -43,7 +43,7 @@ #if BUILDFLAG(IS_WIN) double ProcessMetrics::GetPreciseCPUUsage(TimeDelta cumulative_cpu) { -@@ -156,7 +154,7 @@ double ProcessMetrics::GetPreciseCPUUsage() { +@@ -155,7 +153,7 @@ double ProcessMetrics::GetPreciseCPUUsage() { #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-base_process_process__metrics.h b/www/iridium/files/patch-base_process_process__metrics.h index 2c4491df0275..a51ed2380534 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 2023-01-17 19:19:00 UTC +--- base/process/process_metrics.h.orig 2023-03-13 07:33:08 UTC +++ base/process/process_metrics.h -@@ -36,7 +36,7 @@ +@@ -37,7 +37,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -9,7 +9,7 @@ #include <string> #include <utility> #include <vector> -@@ -51,7 +51,7 @@ class Value; +@@ -50,7 +50,7 @@ namespace base { // Full declaration is in process_metrics_iocounters.h. struct IoCounters; @@ -18,7 +18,7 @@ // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // -@@ -106,7 +106,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -105,7 +105,7 @@ class BASE_EXPORT ProcessMetrics { // convenience wrapper for CreateProcessMetrics(). static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics(); @@ -27,7 +27,7 @@ // Resident Set Size is a Linux/Android specific memory concept. Do not // attempt to extend this to other platforms. BASE_EXPORT size_t GetResidentSetSize() const; -@@ -164,7 +164,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -163,7 +163,7 @@ class BASE_EXPORT ProcessMetrics { #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -36,7 +36,7 @@ // Emits the cumulative CPU usage for all currently active threads since they // were started into the output parameter (replacing its current contents). // Threads that have already terminated will not be reported. Thus, the sum of -@@ -224,7 +224,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -223,7 +223,7 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // BUILDFLAG(IS_POSIX) @@ -45,7 +45,7 @@ // Bytes of swap as reported by /proc/[pid]/status. uint64_t GetVmSwapBytes() const; -@@ -245,7 +245,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -244,7 +244,7 @@ class BASE_EXPORT ProcessMetrics { #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -54,7 +54,7 @@ int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if BUILDFLAG(IS_APPLE) -@@ -264,9 +264,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -263,9 +263,7 @@ 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_; @@ -64,7 +64,7 @@ #if BUILDFLAG(IS_WIN) TimeTicks last_cpu_time_for_precise_cpu_usage_; -@@ -274,7 +272,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -273,7 +271,7 @@ class BASE_EXPORT ProcessMetrics { #endif #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -73,7 +73,7 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -317,7 +315,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -316,7 +314,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \ @@ -82,7 +82,7 @@ // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -352,7 +350,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -351,7 +349,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -91,7 +91,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 -@@ -367,7 +365,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -366,7 +364,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -100,7 +100,7 @@ int buffers = 0; int cached = 0; int active_anon = 0; -@@ -404,7 +402,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK +@@ -403,7 +401,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -109,7 +109,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. -@@ -592,7 +590,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 cf0839c0c5a1..60d4fea860d0 100644 --- a/www/iridium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/iridium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_freebsd.cc.orig 2022-12-01 10:35:46 UTC +--- base/process/process_metrics_freebsd.cc.orig 2023-03-13 07:33:08 UTC +++ base/process/process_metrics_freebsd.cc @@ -3,20 +3,39 @@ // found in the LICENSE file. @@ -72,10 +72,12 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const { return false; } -@@ -67,4 +83,221 @@ size_t GetSystemCommitCharge() { - return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); - } +@@ -65,6 +81,230 @@ size_t GetSystemCommitCharge() { + pagesize = getpagesize(); + return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); ++} ++ +int64_t GetNumberOfThreads(ProcessHandle process) { + // Taken from FreeBSD top (usr.bin/top/machine.c) + @@ -243,54 +245,61 @@ + +SystemDiskInfo& SystemDiskInfo::operator=(const SystemDiskInfo&) = default; + -+Value SystemDiskInfo::ToValue() const { -+ Value res(Value::Type::DICTIONARY); -+ ++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.SetDoubleKey("reads", static_cast<double>(reads)); -+ res.SetDoubleKey("reads_merged", static_cast<double>(reads_merged)); -+ res.SetDoubleKey("sectors_read", static_cast<double>(sectors_read)); -+ res.SetDoubleKey("read_time", static_cast<double>(read_time)); -+ res.SetDoubleKey("writes", static_cast<double>(writes)); -+ res.SetDoubleKey("writes_merged", static_cast<double>(writes_merged)); -+ res.SetDoubleKey("sectors_written", static_cast<double>(sectors_written)); -+ res.SetDoubleKey("write_time", static_cast<double>(write_time)); -+ res.SetDoubleKey("io", static_cast<double>(io)); -+ res.SetDoubleKey("io_time", static_cast<double>(io_time)); -+ res.SetDoubleKey("weighted_io_time", static_cast<double>(weighted_io_time)); ++ res.Set("reads", static_cast<double>(reads)); ++ res.Set("reads_merged", static_cast<double>(reads_merged)); ++ res.Set("sectors_read", static_cast<double>(sectors_read)); ++ res.Set("read_time", static_cast<double>(read_time)); ++ res.Set("writes", static_cast<double>(writes)); ++ res.Set("writes_merged", static_cast<double>(writes_merged)); ++ res.Set("sectors_written", static_cast<double>(sectors_written)); ++ res.Set("write_time", static_cast<double>(write_time)); ++ res.Set("io", static_cast<double>(io)); ++ res.Set("io_time", static_cast<double>(io_time)); ++ res.Set("weighted_io_time", static_cast<double>(weighted_io_time)); + ++ NOTIMPLEMENTED(); ++ + return res; +} + -+Value SystemMemoryInfoKB::ToValue() const { -+ Value res(Value::Type::DICTIONARY); -+ -+ res.SetIntKey("total", total); -+ res.SetIntKey("free", free); -+ res.SetIntKey("available", available); -+ res.SetIntKey("buffers", buffers); -+ res.SetIntKey("cached", cached); -+ res.SetIntKey("active_anon", active_anon); -+ res.SetIntKey("inactive_anon", inactive_anon); -+ res.SetIntKey("active_file", active_file); -+ res.SetIntKey("inactive_file", inactive_file); -+ res.SetIntKey("swap_total", swap_total); -+ res.SetIntKey("swap_free", swap_free); -+ res.SetIntKey("swap_used", swap_total - swap_free); -+ res.SetIntKey("dirty", dirty); -+ res.SetIntKey("reclaimable", reclaimable); ++Value::Dict SystemMemoryInfoKB::ToDict() const { ++ Value::Dict res; ++ res.Set("total", total); ++ res.Set("free", free); ++ res.Set("available", available); ++ res.Set("buffers", buffers); ++ res.Set("cached", cached); ++ 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("reclaimable", reclaimable); ++ ++ NOTIMPLEMENTED(); + + return res; +} + -+Value VmStatInfo::ToValue() const { -+ Value res(Value::Type::DICTIONARY); ++Value::Dict VmStatInfo::ToDict() const { ++ Value::Dict res; ++ // TODO(crbug.com/1334256): Make base::Value able to hold uint64_t and remove ++ // casts below. ++ res.Set("pswpin", static_cast<int>(pswpin)); ++ res.Set("pswpout", static_cast<int>(pswpout)); ++ res.Set("pgmajfault", static_cast<int>(pgmajfault)); + -+ res.SetIntKey("pswpin", pswpin); -+ res.SetIntKey("pswpout", pswpout); -+ res.SetIntKey("pgmajfault", pgmajfault); ++ NOTIMPLEMENTED(); + + return res; -+} + } + } // namespace base 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 15b11af28d11..6ddff5f1e70b 100644 --- a/www/iridium/files/patch-base_process_process__metrics__openbsd.cc +++ b/www/iridium/files/patch-base_process_process__metrics__openbsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_openbsd.cc.orig 2022-10-05 07:34:01 UTC +--- base/process/process_metrics_openbsd.cc.orig 2023-03-13 07:33:08 UTC +++ base/process/process_metrics_openbsd.cc @@ -6,14 +6,23 @@ @@ -124,22 +124,6 @@ + return false; +} + -+SystemDiskInfo::SystemDiskInfo() { -+ reads = 0; -+ reads_merged = 0; -+ sectors_read = 0; -+ read_time = 0; -+ writes = 0; -+ writes_merged = 0; -+ sectors_written = 0; -+ write_time = 0; -+ io = 0; -+ io_time = 0; -+ weighted_io_time = 0; -+} -+ -+SystemDiskInfo::SystemDiskInfo(const SystemDiskInfo& other) = default; -+ +bool GetSystemDiskInfo(SystemDiskInfo* diskinfo) { + NOTIMPLEMENTED(); + return false; @@ -155,57 +139,73 @@ + return 0; +} + -+Value SystemMemoryInfoKB::ToValue() const { -+ Value res(Value::Type::DICTIONARY); -+ res.SetIntKey("total", total); -+ res.SetIntKey("free", free); -+ res.SetIntKey("available", available); -+ res.SetIntKey("buffers", buffers); -+ res.SetIntKey("cached", cached); -+ res.SetIntKey("active_anon", active_anon); -+ res.SetIntKey("inactive_anon", inactive_anon); -+ res.SetIntKey("active_file", active_file); -+ res.SetIntKey("inactive_file", inactive_file); -+ res.SetIntKey("swap_total", swap_total); -+ res.SetIntKey("swap_free", swap_free); -+ res.SetIntKey("swap_used", swap_total - swap_free); -+ res.SetIntKey("dirty", dirty); -+ res.SetIntKey("reclaimable", reclaimable); ++Value::Dict SystemMemoryInfoKB::ToDict() const { ++ Value::Dict res; ++ res.Set("total", total); ++ res.Set("free", free); ++ res.Set("available", available); ++ res.Set("buffers", buffers); ++ res.Set("cached", cached); ++ 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("reclaimable", reclaimable); + + NOTIMPLEMENTED(); + + return res; +} + -+Value VmStatInfo::ToValue() const { -+ Value res(Value::Type::DICTIONARY); -+ res.SetIntKey("pswpin", pswpin); -+ res.SetIntKey("pswpout", pswpout); -+ res.SetIntKey("pgmajfault", pgmajfault); ++Value::Dict VmStatInfo::ToDict() const { ++ Value::Dict res; ++ res.Set("pswpin", static_cast<int>(pswpin)); ++ res.Set("pswpout", static_cast<int>(pswpout)); ++ res.Set("pgmajfault", static_cast<int>(pgmajfault)); + + NOTIMPLEMENTED(); + + return res; ++} ++ ++SystemDiskInfo::SystemDiskInfo() { ++ reads = 0; ++ reads_merged = 0; ++ sectors_read = 0; ++ read_time = 0; ++ writes = 0; ++ writes_merged = 0; ++ sectors_written = 0; ++ write_time = 0; ++ io = 0; ++ io_time = 0; ++ weighted_io_time = 0; +} + -+SystemDiskInfo& SystemDiskInfo::operator=(const SystemDiskInfo&) = default; ++SystemDiskInfo::SystemDiskInfo(const SystemDiskInfo&) = default; + -+Value SystemDiskInfo::ToValue() const { -+ Value res(Value::Type::DICTIONARY); ++SystemDiskInfo& SystemDiskInfo::operator=(const SystemDiskInfo&) = default; + ++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.SetDoubleKey("reads", static_cast<double>(reads)); -+ res.SetDoubleKey("reads_merged", static_cast<double>(reads_merged)); -+ res.SetDoubleKey("sectors_read", static_cast<double>(sectors_read)); -+ res.SetDoubleKey("read_time", static_cast<double>(read_time)); -+ res.SetDoubleKey("writes", static_cast<double>(writes)); -+ res.SetDoubleKey("writes_merged", static_cast<double>(writes_merged)); -+ res.SetDoubleKey("sectors_written", static_cast<double>(sectors_written)); -+ res.SetDoubleKey("write_time", static_cast<double>(write_time)); -+ res.SetDoubleKey("io", static_cast<double>(io)); -+ res.SetDoubleKey("io_time", static_cast<double>(io_time)); -+ res.SetDoubleKey("weighted_io_time", static_cast<double>(weighted_io_time)); ++ res.Set("reads", static_cast<double>(reads)); ++ res.Set("reads_merged", static_cast<double>(reads_merged)); ++ res.Set("sectors_read", static_cast<double>(sectors_read)); ++ res.Set("read_time", static_cast<double>(read_time)); ++ res.Set("writes", static_cast<double>(writes)); ++ res.Set("writes_merged", static_cast<double>(writes_merged)); ++ res.Set("sectors_written", static_cast<double>(sectors_written)); ++ res.Set("write_time", static_cast<double>(write_time)); ++ res.Set("io", static_cast<double>(io)); ++ res.Set("io_time", static_cast<double>(io_time)); ++ res.Set("weighted_io_time", static_cast<double>(weighted_io_time)); + + NOTIMPLEMENTED(); + diff --git a/www/iridium/files/patch-base_process_process__unittest.cc b/www/iridium/files/patch-base_process_process__unittest.cc index aaa7950d5119..574488941ef8 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 2022-10-05 07:34:01 UTC +--- base/process/process_unittest.cc.orig 2023-03-13 07:33:08 UTC +++ base/process/process_unittest.cc -@@ -193,7 +193,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { +@@ -194,7 +194,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_sampling__profiler__thread__token.cc b/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.cc index cb3fb8690d86..c76676c27ffe 100644 --- a/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.cc +++ b/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.cc @@ -1,4 +1,4 @@ ---- base/profiler/sampling_profiler_thread_token.cc.orig 2022-12-01 10:35:46 UTC +--- base/profiler/sampling_profiler_thread_token.cc.orig 2023-03-13 07:33:08 UTC +++ base/profiler/sampling_profiler_thread_token.cc @@ -6,7 +6,7 @@ @@ -9,7 +9,7 @@ #include <pthread.h> #include "base/profiler/stack_base_address_posix.h" -@@ -19,7 +19,7 @@ SamplingProfilerThreadToken GetSamplingProfilerCurrent +@@ -18,7 +18,7 @@ SamplingProfilerThreadToken GetSamplingProfilerCurrent PlatformThreadId id = PlatformThread::CurrentId(); #if BUILDFLAG(IS_ANDROID) return {id, pthread_self()}; @@ -17,4 +17,4 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) absl::optional<uintptr_t> maybe_stack_base = GetThreadStackBaseAddress(id, pthread_self()); - // GetThreadStackBaseAddress should only return nullopt on Android, so + return {id, maybe_stack_base}; diff --git a/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.h b/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.h index e27fb55decad..b93e56d633b2 100644 --- a/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.h +++ b/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.h @@ -1,6 +1,6 @@ ---- base/profiler/sampling_profiler_thread_token.h.orig 2022-12-01 10:35:46 UTC +--- base/profiler/sampling_profiler_thread_token.h.orig 2023-03-13 07:33:08 UTC +++ base/profiler/sampling_profiler_thread_token.h -@@ -11,7 +11,7 @@ +@@ -12,7 +12,7 @@ #if BUILDFLAG(IS_ANDROID) #include <pthread.h> @@ -9,7 +9,7 @@ #include <stdint.h> #endif -@@ -25,7 +25,7 @@ struct SamplingProfilerThreadToken { +@@ -26,7 +26,7 @@ struct SamplingProfilerThreadToken { PlatformThreadId id; #if BUILDFLAG(IS_ANDROID) pthread_t pthread_id; diff --git a/www/iridium/files/patch-base_profiler_stack__base__address__posix.cc b/www/iridium/files/patch-base_profiler_stack__base__address__posix.cc index c6502df1d258..cf7ce69b0f38 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,6 +1,6 @@ ---- base/profiler/stack_base_address_posix.cc.orig 2022-12-01 10:35:46 UTC +--- base/profiler/stack_base_address_posix.cc.orig 2023-03-13 07:33:08 UTC +++ base/profiler/stack_base_address_posix.cc -@@ -15,6 +15,10 @@ +@@ -17,6 +17,10 @@ #include "base/files/scoped_file.h" #endif @@ -11,9 +11,9 @@ #if BUILDFLAG(IS_CHROMEOS) extern "C" void* __libc_stack_end; #endif -@@ -42,15 +46,30 @@ absl::optional<uintptr_t> GetAndroidMainThreadStackBas - #endif +@@ -45,7 +49,21 @@ absl::optional<uintptr_t> GetAndroidMainThreadStackBas + #if !BUILDFLAG(IS_LINUX) uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthread_id) { +#if BUILDFLAG(IS_OPENBSD) + stack_t ss; @@ -26,17 +26,23 @@ +#else pthread_attr_t attr; +#if BUILDFLAG(IS_FREEBSD) ++ int result; + pthread_attr_init(&attr); + pthread_attr_get_np(pthread_id, &attr); +#else - // This 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(). - pthread_getattr_np(pthread_id, &attr); - // See crbug.com/617730 for limitations of this approach on Linux. + // 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 + << logging::SystemErrorCodeToString(result); + // See crbug.com/617730 for limitations of this approach on Linux-like + // systems. +#endif void* address; size_t size; - pthread_attr_getstack(&attr, &address, &size); + result = pthread_attr_getstack(&attr, &address, &size); + CHECK_EQ(result, 0) << "pthread_attr_getstack returned " + << logging::SystemErrorCodeToString(result); pthread_attr_destroy(&attr); +#endif const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size; 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 fd49d6fc321b..5b67f7ff1684 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 2022-10-05 07:34:01 UTC +--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2023-03-13 07:33:08 UTC +++ base/profiler/stack_sampling_profiler_test_util.cc -@@ -39,7 +39,7 @@ +@@ -33,7 +33,7 @@ // Fortunately, it provides _alloca, which functions identically. #include <malloc.h> #define alloca _alloca 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 907acfbebc5b..6c3b33f1a89d 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 2022-12-06 08:09:13 UTC +--- base/strings/safe_sprintf_unittest.cc.orig 2023-03-13 07:33:08 UTC +++ base/strings/safe_sprintf_unittest.cc -@@ -740,6 +740,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) { +@@ -733,6 +733,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) { +@@ -749,6 +750,7 @@ TEST(SafeSPrintfTest, EmitNULL) { #pragma GCC diagnostic pop #endif } diff --git a/www/iridium/files/patch-base_system_sys__info.cc b/www/iridium/files/patch-base_system_sys__info.cc index 3578f2ba09bc..3d3ab0ad35f6 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 2022-10-05 07:34:01 UTC +--- base/system/sys_info.cc.orig 2023-03-13 07:33:08 UTC +++ base/system/sys_info.cc -@@ -101,7 +101,7 @@ std::string SysInfo::HardwareModelName() { +@@ -106,7 +106,7 @@ std::string SysInfo::HardwareModelName() { #endif void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) { diff --git a/www/iridium/files/patch-base_system_sys__info.h b/www/iridium/files/patch-base_system_sys__info.h index c3b7deac2789..6227b678f526 100644 --- a/www/iridium/files/patch-base_system_sys__info.h +++ b/www/iridium/files/patch-base_system_sys__info.h @@ -1,6 +1,6 @@ ---- base/system/sys_info.h.orig 2022-12-06 08:09:13 UTC +--- base/system/sys_info.h.orig 2023-03-13 07:33:08 UTC +++ base/system/sys_info.h -@@ -233,6 +233,8 @@ class BASE_EXPORT SysInfo { +@@ -246,6 +246,8 @@ class BASE_EXPORT SysInfo { static void SetIsCpuSecurityMitigationsEnabled(bool is_enabled); #endif @@ -9,7 +9,7 @@ private: FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); -@@ -243,7 +245,7 @@ class BASE_EXPORT SysInfo { +@@ -257,7 +259,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/iridium/files/patch-base_system_sys__info__posix.cc b/www/iridium/files/patch-base_system_sys__info__posix.cc index e349d3e1d627..70c6b69b968c 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 2023-01-17 19:19:00 UTC +--- base/system/sys_info_posix.cc.orig 2023-03-13 07:33:08 UTC +++ base/system/sys_info_posix.cc -@@ -154,12 +154,12 @@ int NumberOfProcessors() { +@@ -165,12 +165,12 @@ int NumberOfProcessors() { } // namespace internal @@ -15,7 +15,7 @@ // static uint64_t SysInfo::AmountOfVirtualMemory() { -@@ -249,6 +249,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -260,6 +260,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; diff --git a/www/iridium/files/patch-base_system_sys__info__unittest.cc b/www/iridium/files/patch-base_system_sys__info__unittest.cc index 4ee50c0cbaa9..fde058a8758d 100644 --- a/www/iridium/files/patch-base_system_sys__info__unittest.cc +++ b/www/iridium/files/patch-base_system_sys__info__unittest.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_unittest.cc.orig 2022-12-06 08:09:13 UTC +--- base/system/sys_info_unittest.cc.orig 2023-03-13 07:33:08 UTC +++ base/system/sys_info_unittest.cc -@@ -255,12 +255,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) { +@@ -259,12 +259,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) { EXPECT_TRUE(IsStringUTF8(hardware_info->model)); bool empty_result_expected = #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || \ diff --git a/www/iridium/files/patch-base_threading_platform__thread.h b/www/iridium/files/patch-base_threading_platform__thread.h deleted file mode 100644 index cf922ccae694..000000000000 --- a/www/iridium/files/patch-base_threading_platform__thread.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/threading/platform_thread.h.orig 2022-10-05 07:34:01 UTC -+++ base/threading/platform_thread.h -@@ -253,7 +253,7 @@ class BASE_EXPORT PlatformThread { - // Returns a realtime period provided by `delegate`. - static TimeDelta GetRealtimePeriod(Delegate* delegate); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Toggles a specific thread's type at runtime. This can be used to - // change the priority of a thread in a different process and will fail - // if the calling process does not have proper permissions. The diff --git a/www/iridium/files/patch-base_threading_platform__thread__linux.cc b/www/iridium/files/patch-base_threading_platform__thread__linux.cc index 644c4786480e..0fa38641ae8a 100644 --- a/www/iridium/files/patch-base_threading_platform__thread__linux.cc +++ b/www/iridium/files/patch-base_threading_platform__thread__linux.cc @@ -1,6 +1,6 @@ ---- base/threading/platform_thread_linux.cc.orig 2022-12-06 08:09:13 UTC +--- base/threading/platform_thread_linux.cc.orig 2023-03-13 07:33:08 UTC +++ base/threading/platform_thread_linux.cc -@@ -29,7 +29,9 @@ +@@ -30,7 +30,9 @@ #if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) #include <pthread.h> @@ -10,7 +10,7 @@ #include <sys/resource.h> #include <sys/time.h> #include <sys/types.h> -@@ -134,7 +136,7 @@ long sched_setattr(pid_t pid, +@@ -139,7 +141,7 @@ long sched_setattr(pid_t pid, #endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) #endif // BUILDFLAG(IS_CHROMEOS) @@ -19,7 +19,7 @@ const FilePath::CharType kCgroupDirectory[] = FILE_PATH_LITERAL("/sys/fs/cgroup"); -@@ -306,7 +308,7 @@ void SetThreadCgroupsForThreadType(PlatformThreadId th +@@ -313,7 +315,7 @@ void SetThreadCgroupsForThreadType(PlatformThreadId th namespace internal { namespace { @@ -28,7 +28,7 @@ const struct sched_param kRealTimePrio = {8}; #endif } // namespace -@@ -332,7 +334,7 @@ const ThreadTypeToNiceValuePair kThreadTypeToNiceValue +@@ -340,7 +342,7 @@ const ThreadTypeToNiceValuePair kThreadTypeToNiceValue }; bool CanSetThreadTypeToRealtimeAudio() { @@ -37,16 +37,16 @@ // A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke // pthread_setschedparam in SetCurrentThreadTypeForPlatform(). struct rlimit rlim; -@@ -344,7 +346,7 @@ bool CanSetThreadTypeToRealtimeAudio() { +@@ -352,7 +354,7 @@ bool CanSetThreadTypeToRealtimeAudio() { bool SetCurrentThreadTypeForPlatform(ThreadType thread_type, MessagePumpType pump_type_hint) { -#if !BUILDFLAG(IS_NACL) +#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) - // For legacy schedtune interface - SetThreadCgroupsForThreadType(PlatformThread::CurrentId(), thread_type); + const PlatformThreadId tid = PlatformThread::CurrentId(); -@@ -363,7 +365,7 @@ bool SetCurrentThreadTypeForPlatform(ThreadType thread + if (g_thread_type_delegate && +@@ -378,7 +380,7 @@ bool SetCurrentThreadTypeForPlatform(ThreadType thread absl::optional<ThreadPriorityForTest> GetCurrentThreadPriorityForPlatformForTest() { @@ -55,7 +55,7 @@ int maybe_sched_rr = 0; struct sched_param maybe_realtime_prio = {0}; if (pthread_getschedparam(pthread_self(), &maybe_sched_rr, -@@ -382,7 +384,7 @@ GetCurrentThreadPriorityForPlatformForTest() { +@@ -397,7 +399,7 @@ GetCurrentThreadPriorityForPlatformForTest() { void PlatformThread::SetName(const std::string& name) { ThreadIdNameManager::GetInstance()->SetName(name); @@ -64,14 +64,21 @@ // On linux we can get the thread names to show up in the debugger by setting // the process name for the LWP. We don't want to do this for the main // thread because that would rename the process, causing tools like killall -@@ -412,8 +414,10 @@ void PlatformThread::SetThreadType(ProcessId process_i - // priority. - CHECK_NE(thread_id, process_id); +@@ -417,7 +419,7 @@ void PlatformThread::SetName(const std::string& name) + #endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) + } -+#if !BUILDFLAG(IS_BSD) - // For legacy schedtune interface - SetThreadCgroupsForThreadType(thread_id, thread_type); -+#endif +-#if !BUILDFLAG(IS_NACL) ++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) + // static + void PlatformThread::SetThreadTypeDelegate(ThreadTypeDelegate* delegate) { + // A component cannot override a delegate set by another component, thus +@@ -428,7 +430,7 @@ void PlatformThread::SetThreadTypeDelegate(ThreadTypeD + } + #endif - #if BUILDFLAG(IS_CHROMEOS) - // For upstream uclamp interface. We try both legacy (schedtune, as done +-#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) ++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) && !BUILDFLAG(IS_BSD) + // static + void PlatformThread::SetThreadType(ProcessId process_id, + PlatformThreadId thread_id, 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 7c0212726a98..cfba017cce67 100644 --- a/www/iridium/files/patch-base_threading_platform__thread__posix.cc +++ b/www/iridium/files/patch-base_threading_platform__thread__posix.cc @@ -1,15 +1,15 @@ ---- base/threading/platform_thread_posix.cc.orig 2022-12-06 08:09:13 UTC +--- base/threading/platform_thread_posix.cc.orig 2023-03-13 07:33:08 UTC +++ base/threading/platform_thread_posix.cc -@@ -78,7 +78,7 @@ void* ThreadFunc(void* params) { +@@ -77,7 +77,7 @@ void* ThreadFunc(void* params) { if (!thread_params->joinable) base::DisallowSingleton(); -#if !BUILDFLAG(IS_NACL) +#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) - #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(STARSCAN) + #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(USE_STARSCAN) partition_alloc::internal::PCScan::NotifyThreadCreated( partition_alloc::internal::GetStackPointer()); -@@ -380,6 +380,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, +@@ -379,6 +379,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, MessagePumpType pump_type_hint) { #if BUILDFLAG(IS_NACL) NOTIMPLEMENTED(); 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 9f5d18daebd5..65d98611cfea 100644 --- a/www/iridium/files/patch-base_threading_platform__thread__unittest.cc +++ b/www/iridium/files/patch-base_threading_platform__thread__unittest.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_unittest.cc.orig 2023-01-17 19:19:00 UTC +--- base/threading/platform_thread_unittest.cc.orig 2023-03-13 07:33:08 UTC +++ base/threading/platform_thread_unittest.cc @@ -31,7 +31,7 @@ #include "base/time/time.h" @@ -9,7 +9,7 @@ #include <pthread.h> #include <sys/syscall.h> #include <sys/types.h> -@@ -417,7 +417,7 @@ TEST(PlatformThreadTest, +@@ -422,7 +422,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. constexpr bool kCanIncreasePriority = false; -@@ -684,12 +684,16 @@ INSTANTIATE_TEST_SUITE_P( +@@ -701,12 +701,16 @@ INSTANTIATE_TEST_SUITE_P( #endif // BUILDFLAG(IS_APPLE) diff --git a/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc index a7c2c0d7ffaf..af9d7655c571 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 2022-12-01 10:35:46 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2023-03-13 07:33:08 UTC +++ base/trace_event/malloc_dump_provider.cc -@@ -24,6 +24,8 @@ +@@ -25,6 +25,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -186,7 +188,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, +@@ -187,7 +189,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, #if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \ (!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \ @@ -18,7 +18,7 @@ void ReportMallinfoStats(ProcessMemoryDump* pmd, size_t* total_virtual_size, size_t* resident_size, -@@ -357,6 +359,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -358,6 +360,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-build_config_BUILD.gn b/www/iridium/files/patch-build_config_BUILD.gn index fb4eefa994cf..e86fb4f1fc35 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 2022-10-05 07:34:01 UTC +--- build/config/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ build/config/BUILD.gn -@@ -215,13 +215,17 @@ config("default_libs") { +@@ -218,13 +218,17 @@ config("default_libs") { "CoreText.framework", "Foundation.framework", ] diff --git a/www/iridium/files/patch-build_config_compiler_BUILD.gn b/www/iridium/files/patch-build_config_compiler_BUILD.gn index 2dc1e1f59c72..dc863755c1f1 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 2023-01-17 19:19:00 UTC +--- build/config/compiler/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ build/config/compiler/BUILD.gn -@@ -224,13 +224,16 @@ config("default_include_dirs") { +@@ -232,13 +232,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") { @@ -18,7 +18,7 @@ } # compiler --------------------------------------------------------------------- -@@ -276,7 +279,9 @@ config("compiler") { +@@ -284,7 +287,9 @@ config("compiler") { configs += [ # See the definitions below. @@ -28,7 +28,7 @@ ":compiler_codegen", ":compiler_deterministic", ] -@@ -452,6 +457,10 @@ config("compiler") { +@@ -460,6 +465,10 @@ config("compiler") { } } @@ -39,7 +39,7 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_gold) { -@@ -912,7 +921,7 @@ config("compiler_cpu_abi") { +@@ -955,7 +964,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -48,7 +48,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -927,7 +936,7 @@ config("compiler_cpu_abi") { +@@ -970,7 +979,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -57,7 +57,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1272,6 +1281,27 @@ config("compiler_deterministic") { +@@ -1315,6 +1324,27 @@ config("compiler_deterministic") { } } @@ -73,19 +73,19 @@ + clang_revision = exec_script("//tools/clang/scripts/update.py", + update_args, + "trim string") -+ ++ + # This is here so that all files get recompiled after a clang roll and + # when turning clang on or off. (defines are passed via the command line, + # and build system rebuild things when their commandline changes). Nothing + # should ever read this define. + defines = [ "CR_CLANG_REVISION=\"$clang_revision\"" ] -+ } ++ } +} + config("rustc_revision") { if (enable_rust && defined(rustc_version)) { # Similar to the above config, this is here so that all files get -@@ -1493,7 +1523,7 @@ config("default_warnings") { +@@ -1536,7 +1566,7 @@ config("default_warnings") { "-Wno-ignored-pragma-optimize", ] @@ -94,7 +94,7 @@ cflags += [ # TODO(crbug.com/1343975) Evaluate and possibly enable. "-Wno-deprecated-builtins", -@@ -1658,7 +1688,7 @@ config("no_chromium_code") { +@@ -1701,7 +1731,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] @@ -103,7 +103,7 @@ cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -1970,8 +2000,7 @@ config("default_stack_frames") { +@@ -1985,8 +2015,7 @@ config("default_stack_frames") { } # Default "optimization on" config. @@ -113,7 +113,7 @@ if (is_win) { if (chrome_pgo_phase != 2) { # Favor size over speed, /O1 must be before the common flags. -@@ -2016,8 +2045,7 @@ config("xoptimize") { +@@ -2045,8 +2074,7 @@ config("xoptimize") { } # Turn off optimizations. @@ -123,7 +123,7 @@ if (is_win) { cflags = [ "/Od", # Disable optimization. -@@ -2057,8 +2085,7 @@ config("xno_optimize") { +@@ -2086,8 +2114,7 @@ config("xno_optimize") { # Turns up the optimization level. On Windows, this implies whole program # optimization and link-time code generation which is very expensive and should # be used sparingly. @@ -133,7 +133,7 @@ if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2091,8 +2118,7 @@ config("xoptimize_max") { +@@ -2120,8 +2147,7 @@ config("xoptimize_max") { # # TODO(crbug.com/621335) - rework how all of these configs are related # so that we don't need this disclaimer. @@ -143,7 +143,7 @@ if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2118,8 +2144,7 @@ config("xoptimize_speed") { +@@ -2147,8 +2173,7 @@ config("xoptimize_speed") { } } @@ -153,7 +153,7 @@ cflags = [ "-O1" ] + common_optimize_on_cflags rustflags = [ "-Copt-level=1" ] ldflags = common_optimize_on_ldflags -@@ -2185,7 +2210,7 @@ config("afdo_optimize_size") { +@@ -2214,7 +2239,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") { @@ -162,7 +162,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2201,7 +2226,7 @@ config("afdo") { +@@ -2230,7 +2255,7 @@ config("afdo") { cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ] inputs = [ _clang_sample_profile ] } @@ -171,7 +171,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2239,8 +2264,7 @@ config("win_pdbaltpath") { +@@ -2268,8 +2293,7 @@ config("win_pdbaltpath") { } # Full symbols. @@ -180,8 +180,8 @@ +config("symbols") { if (is_win) { if (is_clang) { - cflags = [ "/Z7" ] # Debug information in the .obj files. -@@ -2349,7 +2373,8 @@ config("xsymbols") { + cflags = [ +@@ -2386,7 +2410,8 @@ config("xsymbols") { configs += [ "//build/config:compress_debug_sections" ] } @@ -191,7 +191,7 @@ if (is_apple) { # TODO(https://crbug.com/1050118): Investigate missing debug info on mac. # Make sure we don't use constructor homing on mac. -@@ -2372,8 +2397,7 @@ config("xsymbols") { +@@ -2409,8 +2434,7 @@ config("xsymbols") { # Minimal symbols. # This config guarantees to hold symbol for stack trace which are shown to user # when crash happens in unittests running on buildbot. @@ -201,7 +201,7 @@ if (is_win) { # Functions, files, and line tables only. cflags = [] -@@ -2446,8 +2470,7 @@ config("xminimal_symbols") { +@@ -2484,8 +2508,7 @@ config("xminimal_symbols") { # This configuration contains function names only. That is, the compiler is # told to not generate debug information and the linker then just puts function # names in the final debug information. diff --git a/www/iridium/files/patch-build_config_linux_pkg-config.py b/www/iridium/files/patch-build_config_linux_pkg-config.py index 9949edcdfc97..f3b1f8d5a5a1 100644 --- a/www/iridium/files/patch-build_config_linux_pkg-config.py +++ b/www/iridium/files/patch-build_config_linux_pkg-config.py @@ -1,6 +1,6 @@ ---- build/config/linux/pkg-config.py.orig 2022-03-28 18:11:04 UTC +--- build/config/linux/pkg-config.py.orig 2023-03-13 07:33:08 UTC +++ build/config/linux/pkg-config.py -@@ -109,7 +109,7 @@ def main(): +@@ -108,7 +108,7 @@ def main(): # If this is run on non-Linux platforms, just return nothing and indicate # success. This allows us to "kind of emulate" a Linux build from other # platforms. diff --git a/www/iridium/files/patch-build_config_rust.gni b/www/iridium/files/patch-build_config_rust.gni index b74a05428eb5..e6a1b7d3fb25 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 2022-10-05 07:34:01 UTC +--- build/config/rust.gni.orig 2023-03-13 07:33:08 UTC +++ build/config/rust.gni -@@ -124,7 +124,7 @@ if (enable_rust) { +@@ -134,7 +134,7 @@ if (enable_rust) { rust_sysroot = "//third_party/rust-toolchain" use_unverified_rust_toolchain = false } else { diff --git a/www/iridium/files/patch-build_detect__host__arch.py b/www/iridium/files/patch-build_detect__host__arch.py index 8af599f7181f..2c92005c703a 100644 --- a/www/iridium/files/patch-build_detect__host__arch.py +++ b/www/iridium/files/patch-build_detect__host__arch.py @@ -1,6 +1,6 @@ ---- build/detect_host_arch.py.orig 2022-03-28 18:11:04 UTC +--- build/detect_host_arch.py.orig 2023-03-13 07:33:08 UTC +++ build/detect_host_arch.py -@@ -21,6 +21,8 @@ def HostArch(): +@@ -20,6 +20,8 @@ def HostArch(): host_arch = 'ia32' elif host_arch in ['x86_64', 'amd64']: host_arch = 'x64' diff --git a/www/iridium/files/patch-build_gn__run__binary.py b/www/iridium/files/patch-build_gn__run__binary.py index 1e69b9ec6166..c719f3fb1931 100644 --- a/www/iridium/files/patch-build_gn__run__binary.py +++ b/www/iridium/files/patch-build_gn__run__binary.py @@ -1,6 +1,6 @@ ---- build/gn_run_binary.py.orig 2023-01-17 19:19:00 UTC +--- build/gn_run_binary.py.orig 2023-03-13 07:33:08 UTC +++ build/gn_run_binary.py -@@ -24,7 +24,7 @@ if not os.path.isabs(path): +@@ -23,7 +23,7 @@ if not os.path.isabs(path): # The rest of the arguments are passed directly to the executable. args = [path] + sys.argv[2:] diff --git a/www/iridium/files/patch-build_linux_unbundle_openh264.gn b/www/iridium/files/patch-build_linux_unbundle_openh264.gn deleted file mode 100644 index abd6f584421c..000000000000 --- a/www/iridium/files/patch-build_linux_unbundle_openh264.gn +++ /dev/null @@ -1,21 +0,0 @@ ---- build/linux/unbundle/openh264.gn.orig 2023-01-17 19:19:00 UTC -+++ build/linux/unbundle/openh264.gn -@@ -2,6 +2,7 @@ - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - -+import("//build/buildflag_header.gni") - import("//build/config/linux/pkg_config.gni") - import("//build/shim_headers.gni") - -@@ -33,4 +34,10 @@ source_set("processing") { - source_set("encoder") { - deps = [ ":openh264_shim" ] - public_configs = [ ":config" ] -+} -+ -+buildflag_header("buildflags") { -+ header = "buildflags.h" -+ header_dir = "third_party/openh264" -+ flags = [ "OPENH264_API_WELS=1" ] - } diff --git a/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni index 97e41012ba1c..e8eaeb2df4d9 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 2023-01-17 19:19:00 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2023-03-13 07:33:08 UTC +++ build/toolchain/gcc_toolchain.gni @@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -14,7 +14,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -799,22 +806,12 @@ template("gcc_toolchain") { +@@ -832,22 +839,12 @@ template("gcc_toolchain") { # use_gold too. template("clang_toolchain") { gcc_toolchain(target_name) { 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 fdb4318a26d9..5476da3aa0d2 100644 --- a/www/iridium/files/patch-chrome_app_chrome__command__ids.h +++ b/www/iridium/files/patch-chrome_app_chrome__command__ids.h @@ -1,7 +1,7 @@ ---- chrome/app/chrome_command_ids.h.orig 2022-10-05 07:34:01 UTC +--- chrome/app/chrome_command_ids.h.orig 2023-03-13 07:33:08 UTC +++ chrome/app/chrome_command_ids.h -@@ -67,7 +67,7 @@ - #define IDC_NAME_WINDOW 34049 +@@ -70,7 +70,7 @@ + #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/iridium/files/patch-chrome_app_chrome__main.cc b/www/iridium/files/patch-chrome_app_chrome__main.cc index e5f8fb938bd9..b95ccb4bc161 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 2023-01-17 19:19:00 UTC +--- chrome/app/chrome_main.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/app/chrome_main.cc -@@ -25,7 +25,7 @@ +@@ -27,7 +27,7 @@ #include "chrome/app/notification_metrics.h" #endif @@ -9,7 +9,7 @@ #include "base/base_switches.h" #endif -@@ -151,7 +151,7 @@ int ChromeMain(int argc, const char** argv) { +@@ -157,7 +157,7 @@ int ChromeMain(int argc, const char** argv) { headless::SetUpCommandLine(command_line); } else { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc index 19c80a3b88a7..61e3e781bbaa 100644 --- a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -136,7 +136,7 @@ +@@ -137,7 +137,7 @@ #include "components/about_ui/credit_utils.h" #endif @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -180,16 +180,16 @@ +@@ -181,16 +181,16 @@ #include "v8/include/v8.h" #endif @@ -29,7 +29,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -348,7 +348,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -352,7 +352,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -38,7 +38,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -433,7 +433,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -437,7 +437,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -47,7 +47,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -540,7 +540,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -551,7 +551,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -56,7 +56,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -629,7 +629,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -640,7 +640,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -65,7 +65,7 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::RecordStartupProcessCreationTime( -@@ -911,6 +911,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() { +@@ -928,6 +928,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() { // not always enabled on ChromeOS. #if BUILDFLAG(IS_CHROMEOS) bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled(); @@ -74,7 +74,7 @@ #else bool enable_gwp_asan = true; #endif -@@ -971,7 +973,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { +@@ -984,7 +986,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { base::internal::TimerBase::InitializeFeatures(); base::InitializeCpuReductionExperiment(); base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures(); @@ -83,7 +83,7 @@ base::MessagePumpLibevent::InitializeFeatures(); #elif BUILDFLAG(IS_MAC) base::PlatformThread::InitFeaturesPostFieldTrial(); -@@ -1080,7 +1082,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo +@@ -1116,7 +1118,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo // TODO(crbug.com/1052397): Revisit the macro expression once build flag // switch of lacros-chrome is complete. @@ -92,7 +92,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1110,7 +1112,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo +@@ -1146,7 +1148,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -101,7 +101,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1492,7 +1494,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1528,7 +1530,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -110,7 +110,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) { -@@ -1572,7 +1574,7 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1608,7 +1610,7 @@ absl::variant<int, content::MainFunctionParams> Chrome // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. diff --git a/www/iridium/files/patch-chrome_app_generated__resources.grd b/www/iridium/files/patch-chrome_app_generated__resources.grd index a4dc04d03f30..e26977eb980c 100644 --- a/www/iridium/files/patch-chrome_app_generated__resources.grd +++ b/www/iridium/files/patch-chrome_app_generated__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/generated_resources.grd.orig 2023-01-17 19:19:00 UTC +--- chrome/app/generated_resources.grd.orig 2023-03-13 07:33:08 UTC +++ chrome/app/generated_resources.grd @@ -2,7 +2,7 @@ @@ -9,7 +9,7 @@ for making strings OS specific. Other platform defines such as use_titlecase are declared in tools/grit/grit_rule.gni. --> -@@ -3090,7 +3090,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3181,7 +3181,7 @@ are declared in tools/grit/grit_rule.gni. </if> <!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog --> @@ -18,7 +18,7 @@ <message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog."> Device Credentials </message> -@@ -4820,7 +4820,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4936,7 +4936,7 @@ are declared in tools/grit/grit_rule.gni. Read information about your browser, OS, device, installed software, registry values and files </message> </if> @@ -27,7 +27,7 @@ <message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS" desc="Permission string for enterprise private reporting permission on Linux and MacOS."> Read information about your browser, OS, device, installed software and files </message> -@@ -5493,7 +5493,7 @@ Keep your key file in a safe place. You will need it t +@@ -5603,7 +5603,7 @@ Keep your key file in a safe place. You will need it t Old versions of Chrome Apps won't open on Windows devices after December 2022. Contact your administrator to update to a new version or remove this app. </message> </if> @@ -36,7 +36,7 @@ <message name="IDS_FORCE_INSTALLED_DEPRECATED_APPS_CONTENT" desc="Content of the force installed deprecated app dialog"> Old versions of Chrome Apps won't open on Linux devices after December 2022. Contact your administrator to update to a new version or remove this app. </message> -@@ -5521,7 +5521,7 @@ Keep your key file in a safe place. You will need it t +@@ -5649,7 +5649,7 @@ Keep your key file in a safe place. You will need it t Old versions of Chrome apps won't open on Windows devices after December 2022. You can check if there's a new version available. </message> </if> @@ -45,7 +45,7 @@ <message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch."> Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available. </message> -@@ -9168,7 +9168,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -9448,7 +9448,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW Google Pay </message> @@ -54,7 +54,7 @@ <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders."> Use system title bar and borders </message> -@@ -10501,7 +10501,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -10789,7 +10789,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> @@ -63,7 +63,7 @@ <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window."> Minimize </message> -@@ -12597,7 +12597,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -12904,7 +12904,7 @@ Please help our engineers fix this problem. Tell us wh Open Anyway </message> diff --git a/www/iridium/files/patch-chrome_app_settings__strings.grdp b/www/iridium/files/patch-chrome_app_settings__strings.grdp index 67bf42e66cc1..b43d48b46a94 100644 --- a/www/iridium/files/patch-chrome_app_settings__strings.grdp +++ b/www/iridium/files/patch-chrome_app_settings__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/settings_strings.grdp.orig 2023-01-17 19:19:00 UTC +--- chrome/app/settings_strings.grdp.orig 2023-03-13 07:33:08 UTC +++ chrome/app/settings_strings.grdp -@@ -151,7 +151,7 @@ +@@ -163,7 +163,7 @@ Theme </message> </if> @@ -9,7 +9,7 @@ <message name="IDS_SETTINGS_GTK_THEME" desc="Text of the label describing the system (GTK) browser theme on Linux"> GTK </message> -@@ -171,7 +171,7 @@ +@@ -183,7 +183,7 @@ Use Classic </message> </if> diff --git a/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd b/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd index d3eedd7e5eba..631315c37780 100644 --- a/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd +++ b/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd @@ -1,29 +1,29 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2022-12-01 10:35:46 UTC +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2023-03-13 07:33:08 UTC +++ chrome/app/theme/chrome_unscaled_resources.grd -@@ -19,7 +19,7 @@ - <include name="IDR_ASSISTANT_LOGO_MONOCHROME" file="google_chrome/google_assistant.svg" type="BINDATA" /> - <if expr="_google_chrome_for_testing"> +@@ -16,7 +16,7 @@ + <includes> + <if expr="_google_chrome"> + <then> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <then> + <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/linux/product_logo_64.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/linux/product_logo_128.png" type="BINDATA" /> +@@ -62,7 +62,7 @@ + <else> <!-- not _google_chrome --> + <if expr="_is_chrome_for_testing_branded"> <then> - <if expr="is_linux"> + <if expr="is_posix"> <then> <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/google_chrome_for_testing/linux/product_logo_64.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/google_chrome_for_testing/linux/product_logo_128.png" type="BINDATA" /> -@@ -36,7 +36,7 @@ +@@ -76,7 +76,7 @@ </if> </then> - <else> <!-- not _google_chrome_for_testing --> + <else> <!-- not _is_chrome_for_testing_branded --> - <if expr="is_linux"> + <if expr="is_posix"> <then> - <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/linux/product_logo_64.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/linux/product_logo_128.png" type="BINDATA" /> -@@ -78,7 +78,7 @@ - </if> - </then> - <else> <!-- not _google_chrome --> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <then> - <include name="IDR_PRODUCT_LOGO_64" file="chromium/linux/product_logo_64.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_128" file="chromium/linux/product_logo_128.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_64" file="chromium/linux/product_logo_64.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_128" file="chromium/linux/product_logo_128.png" type="BINDATA" /> diff --git a/www/iridium/files/patch-chrome_app_theme_theme__resources.grd b/www/iridium/files/patch-chrome_app_theme_theme__resources.grd index 2210648ae6c1..3fe786c7779c 100644 --- a/www/iridium/files/patch-chrome_app_theme_theme__resources.grd +++ b/www/iridium/files/patch-chrome_app_theme_theme__resources.grd @@ -1,47 +1,59 @@ ---- chrome/app/theme/theme_resources.grd.orig 2022-12-06 08:09:13 UTC +--- chrome/app/theme/theme_resources.grd.orig 2023-03-13 07:33:08 UTC +++ chrome/app/theme/theme_resources.grd -@@ -135,7 +135,7 @@ +@@ -135,14 +135,14 @@ </if> <if expr="_google_chrome"> <then> - <if expr="is_linux"> + <if expr="is_posix"> <then> - <if expr="_google_chrome_for_testing"> - <then> -@@ -152,7 +152,7 @@ - </else> - </if> <!-- _google_chrome_for_testing --> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/linux/product_logo_16.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/linux/product_logo_32.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/linux/product_logo_32_beta.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/linux/product_logo_32_dev.png" /> </then> - <else> <!-- not is_linux --> + <else> <!-- not is_posix --> <if expr="not is_android"> - <if expr="_google_chrome_for_testing"> - <then> -@@ -176,7 +176,7 @@ - </else> - </if> <!-- _google_chrome_for_testing --> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/product_logo_32.png" /> +@@ -150,7 +150,7 @@ + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/product_logo_32_beta.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/product_logo_32_dev.png" /> </else> - </if> <!-- is_linux --> + </if> <!-- is_posix --> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_CANARY" file="google_chrome/product_logo_32_canary.png" /> <if expr="not is_android"> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="google_chrome/product_logo_name_22.png" /> -@@ -186,7 +186,7 @@ - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_ENTERPRISE_WHITE" file="google_chrome/product_logo_enterprise_white.png" /> - </then> +@@ -162,7 +162,7 @@ <else> <!-- not _google_chrome --> -- <if expr="is_linux"> -+ <if expr="is_posix"> + <if expr="_is_chrome_for_testing_branded"> <then> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/linux/product_logo_16.png" /> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/linux/product_logo_32.png" /> -@@ -195,7 +195,7 @@ - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" /> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" /> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <then> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/linux/product_logo_16.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/linux/product_logo_32.png" /> +@@ -171,10 +171,10 @@ + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/product_logo_16.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/product_logo_32.png" /> + </else> +- </if> <!-- is_linux --> ++ </if> <!-- is_posix --> + </then> + <else> <!-- not _is_chrome_for_testing_branded --> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <then> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/linux/product_logo_16.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/linux/product_logo_32.png" /> +@@ -183,7 +183,7 @@ + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" /> + </else> +- </if> <!-- is_linux --> ++ </if> <!-- is_posix --> </else> -- </if> <!-- is_linux --> -+ </if> <!-- is_posix --> + </if> <!-- _is_chrome_for_testing_branded --> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="chromium/product_logo_name_22.png" /> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22_WHITE" file="chromium/product_logo_name_22_white.png" /> - </else> diff --git a/www/iridium/files/patch-chrome_browser_about__flags.cc b/www/iridium/files/patch-chrome_browser_about__flags.cc index 71b6fb9ae494..dcd61d105f54 100644 --- a/www/iridium/files/patch-chrome_browser_about__flags.cc +++ b/www/iridium/files/patch-chrome_browser_about__flags.cc @@ -1,24 +1,24 @@ ---- chrome/browser/about_flags.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/about_flags.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/about_flags.cc -@@ -217,7 +217,7 @@ - #include "ui/native_theme/native_theme_features.h" +@@ -219,7 +219,7 @@ #include "ui/ui_features.h" + #include "url/url_features.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/allocator/buildflags.h" #endif -@@ -293,7 +293,7 @@ - #include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h" // nogncheck - #endif // ENABLE_SUPERVISED_USERS +@@ -301,7 +301,7 @@ + #include "device/vr/public/cpp/features.h" + #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) #include "ui/ozone/buildflags.h" #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -401,7 +401,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -407,7 +407,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -27,16 +27,16 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -1394,7 +1394,7 @@ const FeatureEntry::FeatureVariation kTabGroupsSaveVar - }; +@@ -1322,7 +1322,7 @@ const FeatureEntry::FeatureVariation kLocalWebApproval + #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { - {"DocumentUseServerScore", "true"}, - {"DocumentUseClientScore", "false"}, -@@ -4810,7 +4810,7 @@ const FeatureEntry kFeatureEntries[] = { + const FeatureEntry::FeatureParam + kOmniboxDocumentProviderCapLowQualitySuggestionsTo1[] = { + {"DocumentProviderMaxLowQualitySuggestions", "1"}, +@@ -4375,13 +4375,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -45,8 +45,6 @@ {"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName, flag_descriptions::kOzonePlatformHintDescription, kOsLinux, MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)}, -@@ -4823,7 +4823,7 @@ const FeatureEntry kFeatureEntries[] = { - password_manager::features::kForceInitialSyncWhenDecryptionFails)}, #endif // BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -54,7 +52,7 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -5090,7 +5090,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4633,7 +4633,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(feed::kDiscoFeedEndpoint)}, #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -63,7 +61,7 @@ {"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName, flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop, FEATURE_VALUE_TYPE(feed::kWebUiFeed)}, -@@ -5699,7 +5699,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5191,7 +5191,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -72,7 +70,7 @@ {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -6335,7 +6335,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5834,7 +5834,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kPointerLockOptionsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kPointerLockOptions)}, @@ -81,7 +79,7 @@ {"enable-async-dns", flag_descriptions::kAsyncDnsName, flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, FEATURE_VALUE_TYPE(features::kAsyncDns)}, -@@ -7337,7 +7337,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6789,7 +6789,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -90,7 +88,7 @@ {"global-media-controls-modern-ui", flag_descriptions::kGlobalMediaControlsModernUIName, flag_descriptions::kGlobalMediaControlsModernUIDescription, -@@ -8174,7 +8174,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7532,7 +7532,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -99,7 +97,16 @@ {"quick-commands", flag_descriptions::kQuickCommandsName, flag_descriptions::kQuickCommandsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kQuickCommands)}, -@@ -8439,7 +8439,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7759,7 +7759,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + {"enable-get-display-media-set", flag_descriptions::kGetDisplayMediaSetName, + flag_descriptions::kGetDisplayMediaSetDescription, + kOsCrOS | kOsLacros | kOsLinux, +@@ -7809,7 +7809,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -108,7 +115,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9056,7 +9056,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8346,7 +8346,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc b/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc index e1f056d7142f..45b4011112d7 100644 --- a/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc +++ b/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc @@ -1,4 +1,4 @@ ---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc @@ -91,7 +91,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch return metrics::OmniboxInputType::QUERY; @@ -6,6 +6,6 @@ case ExternalProtocolHandler::UNKNOWN: { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Linux impl of GetApplicationNameForProtocol doesn't distinguish + // Linux impl of GetApplicationNameForScheme doesn't distinguish // between URL schemes with handers and those without. This will // make the default behaviour be search on Linux. diff --git a/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc b/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc index 87afe784d082..f51b9df4224f 100644 --- a/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc +++ b/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/background/background_mode_manager.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/background/background_mode_manager.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/background/background_mode_manager.cc -@@ -892,7 +892,7 @@ gfx::ImageSkia GetStatusTrayIcon() { +@@ -889,7 +889,7 @@ gfx::ImageSkia GetStatusTrayIcon() { return gfx::ImageSkia(); return family->CreateExact(size).AsImageSkia(); diff --git a/www/iridium/files/patch-chrome_browser_browser__features.cc b/www/iridium/files/patch-chrome_browser_browser__features.cc index 2996f717e48f..da5e09d8d1d8 100644 --- a/www/iridium/files/patch-chrome_browser_browser__features.cc +++ b/www/iridium/files/patch-chrome_browser_browser__features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_features.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/browser_features.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/browser_features.cc -@@ -30,7 +30,7 @@ BASE_FEATURE(kColorProviderRedirectionForThemeProvider +@@ -24,7 +24,7 @@ BASE_FEATURE(kClosedTabCache, // the browser exits. BASE_FEATURE(kDestroyProfileOnBrowserClose, "DestroyProfileOnBrowserClose", 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 ba8db2568e31..f3975caec36a 100644 --- a/www/iridium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/iridium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/browser_process_impl.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/browser_process_impl.cc -@@ -211,7 +211,7 @@ +@@ -212,7 +212,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck #endif -@@ -1160,7 +1160,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1190,7 +1190,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); @@ -18,7 +18,7 @@ ChromeJsErrorReportProcessor::Create(); #endif -@@ -1420,7 +1420,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1450,7 +1450,7 @@ void BrowserProcessImpl::Unpin() { // Mac is currently not supported. // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/iridium/files/patch-chrome_browser_browser__process__impl.h b/www/iridium/files/patch-chrome_browser_browser__process__impl.h index 15444c6285c4..09fa73902491 100644 --- a/www/iridium/files/patch-chrome_browser_browser__process__impl.h +++ b/www/iridium/files/patch-chrome_browser_browser__process__impl.h @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.h.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/browser_process_impl.h.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/browser_process_impl.h -@@ -363,7 +363,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -364,7 +364,7 @@ class BrowserProcessImpl : public BrowserProcess, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc index 3a0774dea704..d2113cdfbbd5 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,4 +1,4 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/chrome_browser_interface_binders.cc @@ -113,13 +113,13 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) @@ -16,7 +16,7 @@ #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h" #endif -@@ -191,7 +191,7 @@ +@@ -192,7 +192,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -25,7 +25,7 @@ #include "chrome/browser/ui/webui/discards/discards.mojom.h" #include "chrome/browser/ui/webui/discards/discards_ui.h" #include "chrome/browser/ui/webui/discards/site_data.mojom.h" -@@ -809,7 +809,7 @@ void PopulateChromeFrameBinders( +@@ -853,7 +853,7 @@ void PopulateChromeFrameBinders( #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -34,7 +34,7 @@ if (!render_frame_host->GetParent()) { map->Add<chrome::mojom::DraggableRegions>( base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed)); -@@ -817,7 +817,7 @@ void PopulateChromeFrameBinders( +@@ -861,7 +861,7 @@ void PopulateChromeFrameBinders( #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -43,7 +43,7 @@ if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && !render_frame_host->GetParentOrOuterDocument()) { // The service binder will reject non-primary main frames, but we still need -@@ -882,14 +882,14 @@ void PopulateChromeWebUIFrameBinders( +@@ -926,14 +926,14 @@ void PopulateChromeWebUIFrameBinders( SegmentationInternalsUI>(map); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -60,7 +60,7 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); #endif -@@ -1289,7 +1289,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1332,7 +1332,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 cb308e2a01c6..c27ee3dcb30d 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,4 +1,4 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/chrome_browser_main.cc @@ -240,11 +240,11 @@ @@ -23,7 +23,7 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h" #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" -@@ -987,7 +987,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -986,7 +986,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -32,7 +32,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -1035,7 +1035,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1042,7 +1042,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc index 868a5d13b516..f7863f18888d 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,15 +1,15 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -395,7 +395,7 @@ - #include "components/user_manager/user_manager.h" +@@ -412,7 +412,7 @@ #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" #include "storage/browser/file_system/external_mount_points.h" + #include "ui/display/screen.h" -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "chrome/browser/chrome_browser_main_linux.h" #elif BUILDFLAG(IS_ANDROID) #include "base/android/application_status_listener.h" -@@ -480,12 +480,12 @@ +@@ -497,12 +497,12 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -24,7 +24,7 @@ #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -494,13 +494,13 @@ +@@ -511,13 +511,13 @@ #include "components/crash/content/browser/crash_handler_host_linux.h" #endif @@ -40,7 +40,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -529,11 +529,11 @@ +@@ -546,11 +546,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -54,7 +54,16 @@ #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif BUILDFLAG(IS_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -1623,7 +1623,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1559,7 +1559,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre + policy::policy_prefs::kPPAPISharedImagesSwapChainAllowed, true); + registry->RegisterBooleanPref( + policy::policy_prefs::kForceEnablePepperVideoDecoderDevAPI, false); +-#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) +@@ -1666,7 +1666,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( is_integration_test, &startup_data_); @@ -63,7 +72,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1662,7 +1662,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1705,7 +1705,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -72,7 +81,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1683,7 +1683,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1726,7 +1726,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); #endif @@ -81,7 +90,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1702,7 +1702,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1745,7 +1745,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -90,7 +99,7 @@ main_parts->AddParts( std::make_unique< chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2507,6 +2507,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2578,6 +2578,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin #elif BUILDFLAG(IS_POSIX) #if BUILDFLAG(IS_ANDROID) bool enable_crash_reporter = true; @@ -99,7 +108,7 @@ #elif BUILDFLAG(IS_CHROMEOS) bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { -@@ -2902,7 +2904,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2949,7 +2951,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); @@ -108,7 +117,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4352,7 +4354,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4442,7 +4444,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -117,7 +126,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4872,14 +4874,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4964,14 +4966,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -134,7 +143,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -4914,7 +4916,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5010,7 +5012,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati handle)); } @@ -143,3 +152,12 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); +@@ -6616,7 +6618,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS + } + + bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + // This is possibly called before `g_browser_process` is initialized. + PrefService* local_state; + if (g_browser_process) { 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 997b4f970953..a5a4d86dc80f 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 2023-01-17 19:19:00 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -442,7 +442,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -444,7 +444,7 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; diff --git a/www/iridium/files/patch-chrome_browser_content__settings_chrome__content__settings__utils.cc b/www/iridium/files/patch-chrome_browser_content__settings_chrome__content__settings__utils.cc deleted file mode 100644 index 0a56fd449b0a..000000000000 --- a/www/iridium/files/patch-chrome_browser_content__settings_chrome__content__settings__utils.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/content_settings/chrome_content_settings_utils.cc.orig 2022-12-06 08:09:13 UTC -+++ chrome/browser/content_settings/chrome_content_settings_utils.cc -@@ -44,7 +44,7 @@ void UpdateLocationBarUiForWebContents(content::WebCon - location_bar->UpdateContentSettingsIcons(); - - // TODO(https://crbug.com/1346734): Enable this on all platforms. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // The document PiP window does not have a location bar, but has some content - // setting views that need to be updated too. - if (browser->is_type_picture_in_picture()) { diff --git a/www/iridium/files/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc b/www/iridium/files/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc index d2f7048ecbb3..b1d334b2ebdc 100644 --- a/www/iridium/files/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc +++ b/www/iridium/files/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc -@@ -69,7 +69,7 @@ void ChromeProtocolHandlerRegistryDelegate::CheckDefau +@@ -68,7 +68,7 @@ void ChromeProtocolHandlerRegistryDelegate::CheckDefau // If true default protocol handlers will be removed if the OS level // registration for a protocol is no longer Chrome. bool ChromeProtocolHandlerRegistryDelegate::ShouldRemoveHandlersNotInOS() { diff --git a/www/iridium/files/patch-chrome_browser_dev__ui__browser__resources.grd b/www/iridium/files/patch-chrome_browser_dev__ui__browser__resources.grd index c2588411092a..dd239847cf28 100644 --- a/www/iridium/files/patch-chrome_browser_dev__ui__browser__resources.grd +++ b/www/iridium/files/patch-chrome_browser_dev__ui__browser__resources.grd @@ -1,6 +1,6 @@ ---- chrome/browser/dev_ui_browser_resources.grd.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/dev_ui_browser_resources.grd.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/dev_ui_browser_resources.grd -@@ -36,7 +36,7 @@ This file specifies browser resources for developer-fa +@@ -33,7 +33,7 @@ This file specifies browser resources for developer-fa <include name="IDR_PREDICTORS_JS" file="${root_gen_dir}\chrome\browser\resources\predictors\predictors.js" use_base_dir="false" type="BINDATA" /> <include name="IDR_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_JS" file="${root_gen_dir}\chrome\browser\resources\predictors\resource_prefetch_predictor.js" use_base_dir="false" type="BINDATA" /> diff --git a/www/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 572754e79a62..729eba3095e2 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 2023-01-17 19:19:00 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1567,7 +1567,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1554,7 +1554,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( 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(); } -@@ -1683,7 +1683,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1668,7 +1668,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()) { -@@ -1729,7 +1729,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl +@@ -1714,7 +1714,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 f12179ed5955..0f5f35d750f5 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__commands.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__commands.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/download/download_commands.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/download/download_commands.cc -@@ -26,7 +26,7 @@ +@@ -27,7 +27,7 @@ #include "ui/base/clipboard/scoped_clipboard_writer.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -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" -@@ -167,7 +167,7 @@ void DownloadCommands::ExecuteCommand(Command command) +@@ -168,7 +168,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__commands.h b/www/iridium/files/patch-chrome_browser_download_download__commands.h index 48fb7e08c9b1..91f7684a7fa6 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__commands.h +++ b/www/iridium/files/patch-chrome_browser_download_download__commands.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.h.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/download/download_commands.h.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/download/download_commands.h -@@ -55,7 +55,7 @@ class DownloadCommands { +@@ -56,7 +56,7 @@ class DownloadCommands { void ExecuteCommand(Command command); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc b/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc index b7e8c9e92109..188ff1b4f1c1 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_file_picker.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/download/download_file_picker.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/download/download_file_picker.cc @@ -17,7 +17,7 @@ #include "content/public/browser/download_manager.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "ui/aura/window.h" -@@ -86,7 +86,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl +@@ -82,7 +82,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl // dialog in Linux (See SelectFileImpl() in select_file_dialog_linux_gtk.cc). // and windows.Here we make owning_window host to browser current active // window if it is null. https://crbug.com/1301898 diff --git a/www/iridium/files/patch-chrome_browser_download_download__item__model.cc b/www/iridium/files/patch-chrome_browser_download_download__item__model.cc index 2c18ac2be2a0..2ee7d826be8e 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_item_model.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/download/download_item_model.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/download/download_item_model.cc -@@ -787,7 +787,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -756,7 +756,7 @@ bool DownloadItemModel::IsCommandChecked( download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); -@@ -830,7 +830,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -799,7 +799,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand base::UmaHistogramBoolean("Download.SetAlwaysOpenTo", !is_checked); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +18,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); -@@ -1232,7 +1232,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1210,7 +1210,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 d4b1c4515ace..93d959590282 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,13 +1,13 @@ ---- chrome/browser/download/download_prefs.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/download/download_prefs.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/download/download_prefs.cc -@@ -13,6 +13,7 @@ - #include "base/callback_helpers.h" +@@ -11,6 +11,7 @@ + #include "base/check.h" #include "base/cxx17_backports.h" +#include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_util.h" - #include "base/no_destructor.h" + #include "base/functional/bind.h" @@ -61,6 +62,10 @@ #include "chrome/browser/ui/pdf/adobe_reader_info_win.h" #endif 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 new file mode 100644 index 000000000000..cdc858c9311b --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc @@ -0,0 +1,11 @@ +--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2023-03-13 07:33:08 UTC ++++ chrome/browser/enterprise/connectors/connectors_service.cc +@@ -507,7 +507,7 @@ bool ConnectorsService::ConnectorsEnabled() const { + + Profile* profile = Profile::FromBrowserContext(context_); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // 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 diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc index 01550de60718..7ec5956b4913 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc @@ -1,20 +1,15 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc -@@ -11,11 +11,11 @@ +@@ -11,7 +11,7 @@ #include "chrome/browser/profiles/profile.h" #include "components/keyed_service/core/keyed_service.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "chrome/browser/browser_process.h" - #if BUILDFLAG(IS_MAC) - #include "chrome/browser/enterprise/connectors/device_trust/browser/mac_device_trust_connector_service.h" --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/connectors/device_trust/browser/browser_device_trust_connector_service.h" - #endif // BUILDFLAG(IS_MAC) #include "chrome/browser/policy/chrome_browser_policy_connector.h" -@@ -45,7 +45,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi +@@ -41,7 +41,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi bool DeviceTrustConnectorServiceFactory::ServiceIsCreatedWithBrowserContext() const { @@ -23,7 +18,7 @@ return IsDeviceTrustConnectorFeatureEnabled(); #else return false; -@@ -81,7 +81,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil +@@ -77,7 +77,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil DeviceTrustConnectorService* service = nullptr; @@ -32,12 +27,3 @@ if (IsDeviceTrustConnectorFeatureEnabled()) { auto* key_manager = g_browser_process->browser_policy_connector() ->chrome_browser_cloud_management_controller() -@@ -89,7 +89,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil - #if BUILDFLAG(IS_MAC) - service = new MacDeviceTrustConnectorService( - key_manager, profile->GetPrefs(), g_browser_process->local_state()); --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - service = new BrowserDeviceTrustConnectorService(key_manager, - profile->GetPrefs()); - #endif // BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc index 77951dbd1832..a17c000fd09a 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc -@@ -14,7 +14,7 @@ +@@ -13,7 +13,7 @@ #if BUILDFLAG(IS_WIN) #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.h" @@ -9,12 +9,12 @@ #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/linux_key_rotation_command.h" #elif BUILDFLAG(IS_MAC) #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.h" -@@ -47,7 +47,7 @@ std::unique_ptr<KeyRotationCommand> KeyRotationCommand - PrefService* local_prefs) { +@@ -45,7 +45,7 @@ std::unique_ptr<KeyRotationCommand> KeyRotationCommand + scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory) { #if BUILDFLAG(IS_WIN) return std::make_unique<WinKeyRotationCommand>(); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return std::make_unique<LinuxKeyRotationCommand>(url_loader_factory); #elif BUILDFLAG(IS_MAC) - return std::make_unique<MacKeyRotationCommand>(url_loader_factory, + return std::make_unique<MacKeyRotationCommand>(url_loader_factory); diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h index 226deaa6955e..1177d16a1436 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h" @@ -9,8 +9,8 @@ #include "third_party/crashpad/crashpad/client/crash_report_database.h" #endif // !BUILDFLAG(IS_FUCHSIA) namespace enterprise_connectors { -@@ -27,7 +27,7 @@ class BrowserCrashEventRouter - BrowserCrashEventRouter& operator=(const BrowserCrashEventRouter&) = delete; +@@ -31,7 +31,7 @@ class BrowserCrashEventRouter + BrowserCrashEventRouter& operator=(BrowserCrashEventRouter&&) = delete; ~BrowserCrashEventRouter() override; -#if !BUILDFLAG(IS_FUCHSIA) @@ -18,7 +18,7 @@ void OnCloudReportingLaunched( enterprise_reporting::ReportScheduler* report_scheduler) override; void UploadToReportingServer( -@@ -42,7 +42,7 @@ class BrowserCrashEventRouter +@@ -46,7 +46,7 @@ class BrowserCrashEventRouter raw_ptr<policy::ChromeBrowserCloudManagementController, DanglingUntriaged> controller_ = nullptr; diff --git a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn index 0befda092a23..86d4406a7ee7 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1332,6 +1332,10 @@ static_library("extensions") { +@@ -1336,6 +1336,10 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/iridium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc index 4ff312c9f9a5..72417ed0f89d 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_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/browser_context_keyed_service_factories.cc.orig 2022-10-05 07:34:01 UTC -+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc -@@ -53,7 +53,7 @@ +--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2023-03-13 07:33:08 UTC ++++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc +@@ -40,7 +40,7 @@ + #include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h" #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" - #include "ppapi/buildflags/buildflags.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h" #endif -@@ -122,7 +122,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() +@@ -92,7 +92,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 8a86503c6f80..21134a581053 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 2023-01-17 19:19:00 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc -@@ -31,7 +31,7 @@ +@@ -32,7 +32,7 @@ #include "components/reporting/util/statusor.h" #endif @@ -9,7 +9,7 @@ #include "base/strings/string_util.h" #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" #include "chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h" -@@ -149,7 +149,7 @@ api::enterprise_reporting_private::ContextInfo ToConte +@@ -150,7 +150,7 @@ api::enterprise_reporting_private::ContextInfo ToConte return info; } @@ -18,7 +18,7 @@ device_signals::SignalsAggregationRequest CreateAggregationRequest( const std::string& user_id, -@@ -209,7 +209,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: +@@ -210,7 +210,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: // getPersistentSecret @@ -27,7 +27,7 @@ EnterpriseReportingPrivateGetPersistentSecretFunction:: EnterpriseReportingPrivateGetPersistentSecretFunction() = default; -@@ -636,7 +636,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: +@@ -637,7 +637,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: } #endif diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h index 8e157fd62036..1880e7f0365d 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h +++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h -@@ -19,7 +19,7 @@ +@@ -20,7 +20,7 @@ #include "components/reporting/proto/synced/record.pb.h" #include "components/reporting/proto/synced/record_constants.pb.h" #include "components/reporting/util/statusor.h" @@ -9,7 +9,7 @@ #include "base/time/time.h" #include "components/device_signals/core/browser/signals_types.h" #endif // BUILDFLAG(IS_CHROMEOS) -@@ -55,7 +55,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction : +@@ -56,7 +56,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction : ~EnterpriseReportingPrivateGetDeviceIdFunction() override; }; @@ -18,7 +18,7 @@ class EnterpriseReportingPrivateGetPersistentSecretFunction : public ExtensionFunction { -@@ -265,7 +265,7 @@ class EnterpriseReportingPrivateEnqueueRecordFunction +@@ -266,7 +266,7 @@ class EnterpriseReportingPrivateEnqueueRecordFunction #endif diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc b/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc index 25eae117cc36..1a748940e744 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc @@ -20,6 +20,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL @@ -6,7 +6,7 @@ DCHECK_CURRENTLY_ON(content::BrowserThread::UI); +#if !defined(OS_BSD) if (g_test_device_list.Get().get() != nullptr) { - base::ThreadTaskRunnerHandle::Get()->PostTask( + base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( FROM_HERE, @@ -33,6 +34,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}, 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 c18b7bae5b49..a61ddde184cd 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 2023-01-17 19:19:00 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -533,7 +533,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall( +@@ -520,7 +520,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall( } void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() { 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 0ad7a7e49822..bea7b24fced3 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 2022-12-06 08:09:13 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -190,7 +190,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -189,7 +189,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -202,7 +202,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -201,7 +201,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist settings_api::PrefType::PREF_TYPE_STRING; (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::PREF_TYPE_NUMBER; diff --git a/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc index d888e00270e9..0679ec5222a9 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 2023-01-17 19:19:00 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -826,7 +826,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -819,7 +819,7 @@ void ExternalProviderImpl::CreateExternalProviders( if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, base::MakeRefCounted<ExternalPrefLoader>( -@@ -854,7 +854,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -847,7 +847,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 f4a17074f869..ec36c1790996 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,11 +1,11 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -252,7 +252,7 @@ const struct { +@@ -309,7 +309,7 @@ const struct { {base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"), kDontBlockChildren}, #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // On Linux also block access to devices via /dev, as well as security - // sensitive data in /sys and /proc. + // On Linux also block access to devices via /dev. {kNoBasePathKey, FILE_PATH_LITERAL("/dev"), kBlockAllChildren}, + // And security sensitive data in /proc and /sys. diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc index c9e4b0ea477b..f12e2e670019 100644 --- a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,15 @@ ---- chrome/browser/flag_descriptions.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/flag_descriptions.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/flag_descriptions.cc -@@ -6417,7 +6417,7 @@ const char kSearchWebInSidePanelDescription[] = +@@ -6087,7 +6087,7 @@ const char kLibAssistantV2MigrationDescription[] = + + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const char kGetDisplayMediaSetName[] = "GetDisplayMediaSet API"; + const char kGetDisplayMediaSetDescription[] = + "When enabled, the getDisplayMediaSet API for capturing multiple surfaces " +@@ -6316,7 +6316,7 @@ const char kSearchWebInSidePanelDescription[] = // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +18,7 @@ const char kQuickCommandsName[] = "Quick Commands"; const char kQuickCommandsDescription[] = "Enable a text interface to browser features. Invoke with Ctrl-Space."; -@@ -6426,7 +6426,7 @@ const char kQuickCommandsDescription[] = +@@ -6325,7 +6325,7 @@ const char kQuickCommandsDescription[] = // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +27,7 @@ const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -6440,7 +6440,7 @@ const char kWebShareDescription[] = +@@ -6346,7 +6346,7 @@ const char kWebShareDescription[] = "platforms."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -27,26 +36,17 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -6460,7 +6460,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -6366,7 +6366,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const char kForcePasswordInitialSyncWhenDecryptionFailsName[] = - "Force initial sync to clean local undecryptable passwords during startup"; - const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[] = -@@ -6468,7 +6468,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail - "storage and requests initial sync."; - #endif // BUILDFLAG(IS_LINUX) - -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -6477,7 +6477,7 @@ const char kSkipUndecryptablePasswordsDescription[] = - "there are undecryptable ones."; +@@ -6380,7 +6380,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail + "storage and requests initial sync."; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -54,7 +54,7 @@ const char kAsyncDnsName[] = "Async DNS resolver"; const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -@@ -6577,7 +6577,7 @@ const char kElasticOverscrollDescription[] = +@@ -6481,7 +6481,7 @@ const char kElasticOverscrollDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.h b/www/iridium/files/patch-chrome_browser_flag__descriptions.h index 66170653f1d3..609f99a69bf3 100644 --- a/www/iridium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.h @@ -1,6 +1,15 @@ ---- chrome/browser/flag_descriptions.h.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/flag_descriptions.h.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/flag_descriptions.h -@@ -3693,7 +3693,7 @@ extern const char kSearchWebInSidePanelDescription[]; +@@ -3520,7 +3520,7 @@ extern const char kLacrosScreenCoordinatesEnabledName[ + extern const char kLacrosScreenCoordinatesEnabledDescription[]; + #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + extern const char kGetDisplayMediaSetName[]; + extern const char kGetDisplayMediaSetDescription[]; + +@@ -3639,14 +3639,14 @@ extern const char kSearchWebInSidePanelDescription[]; // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +18,15 @@ extern const char kQuickCommandsName[]; extern const char kQuickCommandsDescription[]; -@@ -3710,7 +3710,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // defined (OS_FUCHSIA) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + extern const char kWebShareName[]; + extern const char kWebShareDescription[]; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) +@@ -3656,7 +3656,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -18,14 +35,17 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -3723,18 +3723,18 @@ extern const char kForcePasswordInitialSyncWhenDecrypt - extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[]; +@@ -3666,7 +3666,7 @@ extern const char kOzonePlatformHintName[]; + extern const char kOzonePlatformHintDescription[]; #endif // BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; + +@@ -3674,13 +3674,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt + extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -40,7 +60,7 @@ extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -3809,7 +3809,7 @@ extern const char kElasticOverscrollDescription[]; +@@ -3760,7 +3760,7 @@ extern const char kElasticOverscrollDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ diff --git a/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc b/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc index 3cdf8238d7b2..a96bb353ab38 100644 --- a/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc +++ b/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/headless/headless_mode_util.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/headless/headless_mode_util.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/headless/headless_mode_util.cc @@ -10,11 +10,11 @@ // New headless mode is available on Linux, Windows and Mac platforms. @@ -11,8 +11,8 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/gl/gl_switches.h" - #include "ui/ozone/public/ozone_switches.h" + #include "ui/gl/gl_switches.h" // nogncheck + #include "ui/ozone/public/ozone_switches.h" // nogncheck #endif // BUILDFLAG(IS_LINUX) @@ -64,7 +64,7 @@ void SetUpCommandLine(const base::CommandLine* command base::CommandLine::ForCurrentProcess()->AppendSwitch( diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc new file mode 100644 index 000000000000..1d8645eb670a --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc @@ -0,0 +1,20 @@ +--- chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2023-03-13 07:33:08 UTC ++++ chrome/browser/media/webrtc/capture_policy_utils.cc +@@ -118,7 +118,7 @@ AllowedScreenCaptureLevel GetAllowedCaptureLevel(const + + bool IsGetDisplayMediaSetSelectAllScreensAllowedForAnySite( + content::BrowserContext* context) { +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + Profile* profile = Profile::FromBrowserContext(context); + if (!profile) { + return false; +@@ -145,7 +145,7 @@ bool IsGetDisplayMediaSetSelectAllScreensAllowedForAny + bool IsGetDisplayMediaSetSelectAllScreensAllowed( + content::BrowserContext* context, + const GURL& url) { +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + Profile* profile = Profile::FromBrowserContext(context); + if (!profile) + return false; diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc new file mode 100644 index 000000000000..8dfc95378e72 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc @@ -0,0 +1,47 @@ +--- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-03-13 07:33:08 UTC ++++ chrome/browser/media/webrtc/chrome_screen_enumerator.cc +@@ -20,7 +20,7 @@ + #if BUILDFLAG(IS_CHROMEOS_ASH) + #include "ash/shell.h" + #include "ui/aura/window.h" +-#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/functional/callback.h" + #include "content/public/browser/desktop_capture.h" + #endif +@@ -31,7 +31,7 @@ base::LazyInstance<std::vector<aura::Window*>>::Destru + root_windows_for_testing_ = LAZY_INSTANCE_INITIALIZER; + } // namespace + +-#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + namespace { + base::LazyInstance<std::unique_ptr<webrtc::DesktopCapturer>>::DestructorAtExit + g_desktop_capturer_for_testing = LAZY_INSTANCE_INITIALIZER; +@@ -77,7 +77,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens( + return stream_devices_set; + } + +-#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + blink::mojom::StreamDevicesSetPtr EnumerateScreens( + blink::mojom::MediaStreamType stream_type) { + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); +@@ -128,7 +128,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting( + root_windows_for_testing_.Get() = std::move(root_windows); + } + +-#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void ChromeScreenEnumerator::SetDesktopCapturerForTesting( + std::unique_ptr<webrtc::DesktopCapturer> capturer) { + g_desktop_capturer_for_testing.Get() = std::move(capturer); +@@ -144,7 +144,7 @@ void ChromeScreenEnumerator::EnumerateScreens( + DCHECK(base::FeatureList::IsEnabled( + features::kGetDisplayMediaSetAutoSelectAllScreens)); + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + content::GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(::EnumerateScreens, stream_type), + base::BindOnce( diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h b/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h new file mode 100644 index 000000000000..5330b06f10bd --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h @@ -0,0 +1,20 @@ +--- chrome/browser/media/webrtc/chrome_screen_enumerator.h.orig 2023-03-13 07:33:08 UTC ++++ chrome/browser/media/webrtc/chrome_screen_enumerator.h +@@ -21,7 +21,7 @@ namespace aura { + class Window; + } + +-#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + namespace webrtc { + class DesktopCapturer; + } +@@ -42,7 +42,7 @@ class ChromeScreenEnumerator : public media::ScreenEnu + + #if BUILDFLAG(IS_CHROMEOS_ASH) + static void SetRootWindowsForTesting(std::vector<aura::Window*> root_windows); +-#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + static void SetDesktopCapturerForTesting( + std::unique_ptr<webrtc::DesktopCapturer> capturer); + #endif diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc index 397d9f186fa0..c63090263589 100644 --- a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc +++ b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc -@@ -40,7 +40,7 @@ const char kProduct[] = "Chrome"; +@@ -41,7 +41,7 @@ const char kProduct[] = "Chrome"; const char kProduct[] = "Chrome_Mac"; #elif BUILDFLAG(IS_CHROMEOS_ASH) const char kProduct[] = "Chrome_ChromeOS"; diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc index 88e0199ad9fb..03ca3609fe1a 100644 --- a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc +++ b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc -@@ -24,10 +24,10 @@ +@@ -23,10 +23,10 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/render_process_host.h" @@ -13,7 +13,7 @@ using webrtc_event_logging::WebRtcEventLogManager; -@@ -281,7 +281,7 @@ void WebRtcLoggingController::StartEventLogging( +@@ -277,7 +277,7 @@ void WebRtcLoggingController::StartEventLogging( web_app_id, callback); } @@ -22,7 +22,7 @@ void WebRtcLoggingController::GetLogsDirectory( LogsDirectoryCallback callback, LogsDirectoryErrorCallback error_callback) { -@@ -327,7 +327,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess +@@ -322,7 +322,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess FROM_HERE, base::BindOnce(std::move(callback), file_system.id(), registered_name)); } diff --git a/www/iridium/files/patch-chrome_browser_memory__details__linux.cc b/www/iridium/files/patch-chrome_browser_memory__details__linux.cc index 1b2f2d46d1d6..7930429bcbf8 100644 --- a/www/iridium/files/patch-chrome_browser_memory__details__linux.cc +++ b/www/iridium/files/patch-chrome_browser_memory__details__linux.cc @@ -1,13 +1,13 @@ ---- chrome/browser/memory_details_linux.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/memory_details_linux.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/memory_details_linux.cc -@@ -13,6 +13,7 @@ +@@ -12,6 +12,7 @@ + #include <memory> #include <set> - #include "base/bind.h" +#include "base/command_line.h" #include "base/files/file_util.h" + #include "base/functional/bind.h" #include "base/process/process_iterator.h" - #include "base/process/process_metrics.h" @@ -27,6 +28,7 @@ #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" 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 407a736655b8..304da1f72b62 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,18 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc @@ -61,8 +61,10 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if 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" -@@ -494,7 +496,7 @@ void RecordStartupMetrics() { +@@ -491,7 +493,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. diff --git a/www/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 a5617c82b3d4..7f7c93b34ee7 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 2023-01-17 19:19:00 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -176,7 +176,7 @@ +@@ -174,7 +174,7 @@ #include "chrome/notification_helper/notification_helper_constants.h" #endif @@ -9,7 +9,7 @@ #include "components/metrics/motherboard_metrics_provider.h" #endif -@@ -735,7 +735,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -736,7 +736,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::CPUMetricsProvider>()); @@ -18,7 +18,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::MotherboardMetricsProvider>()); #endif -@@ -814,7 +814,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -817,7 +817,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); -@@ -912,7 +912,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -915,7 +915,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -36,7 +36,7 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1097,7 +1097,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1099,7 +1099,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc b/www/iridium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc index f1c7038fb97d..d4ba6c25ae1c 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc +++ b/www/iridium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/perf/cpu_identity.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/metrics/perf/cpu_identity.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/metrics/perf/cpu_identity.cc -@@ -109,7 +109,7 @@ CPUIdentity GetCPUIdentity() { +@@ -141,7 +141,7 @@ CPUIdentity GetCPUIdentity() { result.release = #if BUILDFLAG(IS_CHROMEOS_ASH) base::SysInfo::KernelVersion(); 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 2d258e601a14..1c5a96fa9d48 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 2023-01-17 19:19:00 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -92,7 +92,7 @@ @@ -9,7 +9,7 @@ #include "chrome/common/chrome_paths_internal.h" #include "chrome/grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" -@@ -174,7 +174,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -177,7 +177,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -18,7 +18,7 @@ auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -452,7 +452,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -455,7 +455,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -27,7 +27,7 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -524,7 +524,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -527,7 +527,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/iridium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc b/www/iridium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc index 0d1c471f4e10..c6dad08cbb34 100644 --- a/www/iridium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc +++ b/www/iridium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/password_manager/password_reuse_manager_factory.cc -@@ -92,7 +92,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic +@@ -101,7 +101,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_platform__util__linux.cc b/www/iridium/files/patch-chrome_browser_platform__util__linux.cc index 8a2d6bccdc86..8562611527fd 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 2022-10-05 07:34:01 UTC +--- chrome/browser/platform_util_linux.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/platform_util_linux.cc -@@ -295,7 +295,9 @@ void RunCommand(const std::string& command, +@@ -298,7 +298,9 @@ void RunCommand(const std::string& command, base::LaunchOptions options; 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 e68847803722..eb037bf7d8b0 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 2022-10-05 07:34:01 UTC +--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc -@@ -47,7 +47,7 @@ +@@ -48,7 +48,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) -@@ -56,7 +56,7 @@ +@@ -57,7 +57,7 @@ #include "chrome/install_static/install_util.h" #endif // BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/device_trust_features.h" #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" -@@ -89,7 +89,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: +@@ -90,7 +90,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>(); -@@ -244,7 +244,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC +@@ -245,7 +245,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 b1084630e082..b04a080e9ffc 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,11 +1,12 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -193,12 +193,12 @@ +@@ -201,17 +201,17 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/enterprise/idle/action.h" #include "components/device_signals/core/browser/pref_names.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -15,7 +16,12 @@ #include "chrome/browser/web_applications/policy/web_app_settings_policy_handler.h" #endif -@@ -727,14 +727,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) + #include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +@@ -745,14 +745,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -32,7 +38,7 @@ { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1358,7 +1358,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1382,7 +1382,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -41,7 +47,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1428,18 +1428,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1452,18 +1452,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -63,7 +69,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1452,7 +1452,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1476,7 +1476,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ @@ -72,7 +78,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1562,7 +1562,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1583,7 +1583,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -81,16 +87,23 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -1649,7 +1649,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1670,13 +1670,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS) +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + { key::kGetDisplayMediaSetSelectAllScreensAllowedForUrls, + prefs::kManagedGetDisplayMediaSetSelectAllScreensAllowedForUrls, + base::Value::Type::LIST }, + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) + -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -1696,7 +1696,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1723,7 +1723,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) \ @@ -99,16 +112,34 @@ { key::kChromeAppsEnabled, extensions::pref_names::kChromeAppsEnabled, base::Value::Type::BOOLEAN }, -@@ -1756,7 +1756,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1783,7 +1783,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { key::kPrefixedStorageInfoEnabled, storage::kPrefixedStorageInfoEnabled, base::Value::Type::BOOLEAN }, -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) { key::kHighEfficiencyModeEnabled, performance_manager::user_tuning::prefs::kHighEfficiencyModeEnabled, base::Value::Type::BOOLEAN }, -@@ -2062,7 +2062,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -1828,7 +1828,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + policy::policy_prefs::kForceEnablePepperVideoDecoderDevAPI, + base::Value::Type::BOOLEAN }, + #endif // BUILDFLAG(ENABLE_PPAPI) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + { key::kOutOfProcessSystemDnsResolutionEnabled, + prefs::kOutOfProcessSystemDnsResolutionEnabled, + base::Value::Type::BOOLEAN }, +@@ -2092,7 +2092,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + #endif // BUILDFLAG(IS_ANDROID) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + handlers->AddHandler( + std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); + handlers->AddHandler( +@@ -2150,7 +2150,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -117,7 +148,7 @@ handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -2097,7 +2097,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2185,7 +2185,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) || \ @@ -126,16 +157,16 @@ signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>( key::kForceBrowserSignin, prefs::kForceBrowserSignin, base::Value::Type::BOOLEAN)); -@@ -2435,7 +2435,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH - chrome_schema)); - +@@ -2526,7 +2526,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + extensions::pref_names::kManifestV2Availability, /*min=*/0, /*max=*/3, + /*clamp=*/false)); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) handlers->AddHandler( std::make_unique<web_app::WebAppSettingsPolicyHandler>(chrome_schema)); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -2448,7 +2448,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2539,7 +2539,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -144,7 +175,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -2456,7 +2456,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2547,7 +2547,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -153,3 +184,12 @@ handlers->AddHandler(std::make_unique<SimplePolicyHandler>( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); +@@ -2560,7 +2560,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + handlers->AddHandler( + std::make_unique<first_party_sets::FirstPartySetsOverridesPolicyHandler>( + chrome_schema)); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) + handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>()); + #endif // 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 edf2dad2e0bf..7558f2a0937c 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 2023-01-17 19:19:00 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -449,14 +449,14 @@ +@@ -458,14 +458,14 @@ #include "components/os_crypt/os_crypt.h" #endif @@ -17,7 +17,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -489,7 +489,7 @@ +@@ -498,7 +498,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -26,7 +26,7 @@ #include "ui/color/system_theme.h" #endif -@@ -1008,7 +1008,7 @@ void RegisterProfilePrefsForMigration( +@@ -1069,7 +1069,7 @@ void RegisterProfilePrefsForMigration( registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0); #endif @@ -35,7 +35,7 @@ // Deprecated 08/2022. registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false); #endif -@@ -1259,7 +1259,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1346,7 +1346,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_WIN) @@ -44,7 +44,7 @@ web_app::url_handler_prefs::RegisterLocalStatePrefs(registry); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -1586,11 +1586,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1683,11 +1683,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry); #endif @@ -58,7 +58,7 @@ browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif -@@ -1974,7 +1974,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { +@@ -2086,7 +2086,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { profile_prefs->ClearPref(kProfileAvatarTutorialShown); #endif 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 61db7e1db227..94912293763b 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 2022-10-05 07:34:01 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -138,7 +138,7 @@ const char* const kPersistentPrefNames[] = { +@@ -139,7 +139,7 @@ const char* const kPersistentPrefNames[] = { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 8a6adda92e2a..b10f803560b1 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,6 +1,6 @@ ---- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/printing/print_backend_service_manager.cc -@@ -493,7 +493,7 @@ absl::optional<uint32_t> PrintBackendServiceManager::R +@@ -547,7 +547,7 @@ PrintBackendServiceManager::RegisterClient( query_clients_.insert(client_id); break; case ClientType::kQueryWithUi: @@ -9,7 +9,7 @@ if (!query_with_ui_clients_.empty()) return absl::nullopt; #endif -@@ -729,7 +729,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate +@@ -811,7 +811,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate break; case ClientType::kQueryWithUi: @@ -18,12 +18,12 @@ // No need to update if there were other query with UI clients. if (query_with_ui_clients_.size() > 1) return absl::nullopt; -@@ -786,7 +786,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate +@@ -868,7 +868,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate return kNoClientsRegisteredResetOnIdleTimeout; case ClientType::kQueryWithUi: -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // No need to update if there were other query with UI clients. - if (!query_with_ui_clients_.empty()) + if (HasQueryWithUiClientForRemoteId(remote_id)) { return absl::nullopt; diff --git a/www/iridium/files/patch-chrome_browser_printing_print__job__worker.cc b/www/iridium/files/patch-chrome_browser_printing_print__job__worker.cc deleted file mode 100644 index 776473006961..000000000000 --- a/www/iridium/files/patch-chrome_browser_printing_print__job__worker.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/printing/print_job_worker.cc.orig 2023-01-17 19:19:00 UTC -+++ chrome/browser/printing/print_job_worker.cc -@@ -206,7 +206,7 @@ void PrintJobWorker::SetSettings(base::Value::Dict new - crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>( - print_backend->GetPrinterDriverInfo(printer_name)); - --#if BUILDFLAG(IS_LINUX) && defined(USE_CUPS) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_CUPS) - PrinterBasicInfo basic_info; - if (print_backend->GetPrinterBasicInfo(printer_name, &basic_info) == - mojom::ResultCode::kSuccess) { diff --git a/www/iridium/files/patch-chrome_browser_printing_printer__query.cc b/www/iridium/files/patch-chrome_browser_printing_printer__query.cc new file mode 100644 index 000000000000..84a6a39dcd19 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_printing_printer__query.cc @@ -0,0 +1,11 @@ +--- chrome/browser/printing/printer_query.cc.orig 2023-03-13 07:33:08 UTC ++++ chrome/browser/printing/printer_query.cc +@@ -284,7 +284,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di + crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>( + print_backend->GetPrinterDriverInfo(printer_name)); + +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_CUPS) ++#if (BUILDFLAG(IS_BSD) || BUILDFLAG(IS_LINUX)) && BUILDFLAG(USE_CUPS) + PrinterBasicInfo basic_info; + if (print_backend->GetPrinterBasicInfo(printer_name, &basic_info) == + mojom::ResultCode::kSuccess) { diff --git a/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc b/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc index e91ae056c8f0..15d2b5bce355 100644 --- a/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/process_singleton_posix.cc -@@ -97,7 +97,7 @@ +@@ -96,7 +96,7 @@ #include "net/base/network_interfaces.h" #include "ui/base/l10n/l10n_util.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/process_singleton_dialog_linux.h" #endif -@@ -351,7 +351,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo +@@ -350,7 +350,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo if (g_disable_prompt) return g_user_opted_unlock_in_use_profile; 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 c6ef7a57c8b2..8025895868f6 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,15 +1,15 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -261,7 +261,7 @@ - #include "chrome/browser/ui/cocoa/screentime/screentime_features.h" +@@ -262,7 +262,7 @@ #endif --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/idle/idle_service_factory.h" #endif -@@ -448,11 +448,11 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -451,12 +451,12 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,8 +18,9 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) enterprise_idle::IdleServiceFactory::GetInstance(); #endif ModelTypeStoreServiceFactory::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 6d9511dff3a8..f9e0ccd752ee 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 2023-01-17 19:19:00 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -258,6 +258,10 @@ +@@ -257,6 +257,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #endif @@ -11,7 +11,7 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -846,7 +850,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -863,7 +867,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/iridium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts b/www/iridium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts index fdca0e8e76b0..f8a903032dee 100644 --- a/www/iridium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts +++ b/www/iridium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts @@ -1,4 +1,4 @@ ---- chrome/browser/resources/sandbox_internals/sandbox_internals.ts.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/resources/sandbox_internals/sandbox_internals.ts.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/resources/sandbox_internals/sandbox_internals.ts @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be @@ -8,7 +8,7 @@ +// <if expr="is_posix or is_chromeos"> import './strings.m.js'; - import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; + import {loadTimeData} from 'chrome://resources/js/load_time_data.js'; @@ -121,7 +121,7 @@ function androidHandler() { } // </if> diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html index 3bd5d7afe61e..3785575ae317 100644 --- a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html +++ b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html @@ -1,15 +1,15 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.html -@@ -27,7 +27,7 @@ - <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]" +@@ -28,7 +28,7 @@ label="$i18n{themes}" sub-label="[[themeSublabel_]]" + button-aria-description="$i18n{opensInNewTab}" on-click="openThemeUrl_" external></cr-link-row> -<if expr="not is_linux"> +<if expr="not is_posix"> <template is="dom-if" if="[[prefs.extensions.theme.id.value]]"> <div class="separator"></div> <cr-button id="useDefault" on-click="onUseDefaultClick_"> -@@ -35,7 +35,7 @@ +@@ -36,7 +36,7 @@ </cr-button> </template> </if> @@ -18,7 +18,7 @@ <div class="settings-row continuation" hidden="[[!showThemesSecondary_( prefs.extensions.theme.id.value, systemTheme_)]]" -@@ -142,7 +142,7 @@ +@@ -143,7 +143,7 @@ </div> </template> diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_route.ts b/www/iridium/files/patch-chrome_browser_resources_settings_route.ts index 3ea343ef2a84..6ff61a00d5ec 100644 --- a/www/iridium/files/patch-chrome_browser_resources_settings_route.ts +++ b/www/iridium/files/patch-chrome_browser_resources_settings_route.ts @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/route.ts.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/resources/settings/route.ts.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/resources/settings/route.ts -@@ -202,7 +202,7 @@ function createBrowserSettingsRoutes(): Partial<Settin +@@ -220,7 +220,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes r.ACCESSIBILITY = r.ADVANCED.createSection( '/accessibility', 'a11y', loadTimeData.getString('a11yPageTitle')); diff --git a/www/iridium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html b/www/iridium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html index 9a2156c07de2..78bf6f669200 100644 --- a/www/iridium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html +++ b/www/iridium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html @@ -1,6 +1,6 @@ ---- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html -@@ -395,7 +395,7 @@ +@@ -556,7 +556,7 @@ consent-confirmation autofocus> $i18n{syncConfirmationConfirmLabel} </cr-button> @@ -9,7 +9,7 @@ <cr-button id="settingsButton" on-click="onGoToSettings_" disabled="[[anyButtonClicked_]]" consent-confirmation> $i18n{syncConfirmationSettingsLabel} -@@ -405,7 +405,7 @@ +@@ -566,7 +566,7 @@ disabled="[[anyButtonClicked_]]"> $i18n{syncConfirmationUndoLabel} </cr-button> @@ -18,7 +18,7 @@ <cr-button id="settingsButton" on-click="onGoToSettings_" disabled="[[anyButtonClicked_]]" consent-confirmation> $i18n{syncConfirmationSettingsLabel} -@@ -448,7 +448,7 @@ +@@ -609,7 +609,7 @@ consent-confirmation> $i18n{syncConfirmationConfirmLabel} </cr-button> @@ -27,7 +27,7 @@ <cr-button id="settingsButton" on-click="onGoToSettings_" disabled="[[anyButtonClicked_]]" consent-confirmation> $i18n{syncConfirmationSettingsLabel} -@@ -458,7 +458,7 @@ +@@ -619,7 +619,7 @@ disabled="[[anyButtonClicked_]]"> $i18n{syncConfirmationUndoLabel} </cr-button> 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 3992fe6883c9..7d3e3fac221c 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 2022-10-05 07:34:01 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -710,7 +710,7 @@ void IncidentReportingService::OnEnvironmentDataCollec +@@ -708,7 +708,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_sync_chrome__sync__client.cc b/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc index 86f6e43952b7..2fe879ebc601 100644 --- a/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,6 +1,24 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -445,7 +445,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -126,7 +126,7 @@ + #endif // BUILDFLAG(IS_ANDROID) + + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h" + #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || +@@ -467,7 +467,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy + #endif // !BUILDFLAG(IS_ANDROID) + + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + if (features::kTabGroupsSaveSyncIntegration.Get()) { + controllers.push_back(std::make_unique<syncer::ModelTypeController>( + syncer::SAVED_TAB_GROUP, +@@ -480,7 +480,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy // Chrome prefers OS provided spell checkers where they exist. So only sync the // custom dictionary on platforms that typically don't provide one. @@ -9,3 +27,12 @@ // Dictionary sync is enabled by default. if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { controllers.push_back( +@@ -639,7 +639,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate> + ChromeSyncClient::GetControllerDelegateForModelType(syncer::ModelType type) { + switch (type) { + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + case syncer::SAVED_TAB_GROUP: { + DCHECK(features::kTabGroupsSaveSyncIntegration.Get()); + return SavedTabGroupServiceFactory::GetForProfile(profile_) 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 d2fbf8f50db5..b56fcedf18ab 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 2022-10-05 07:34:01 UTC +--- chrome/browser/sync/device_info_sync_client_impl.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/sync/device_info_sync_client_impl.cc -@@ -42,7 +42,7 @@ std::string DeviceInfoSyncClientImpl::GetSigninScopedD +@@ -41,7 +41,7 @@ std::string DeviceInfoSyncClientImpl::GetSigninScopedD // 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 new file mode 100644 index 000000000000..1f03bf26c2a1 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_sync_sync__service__factory.cc @@ -0,0 +1,29 @@ +--- chrome/browser/sync/sync_service_factory.cc.orig 2023-03-13 07:33:08 UTC ++++ chrome/browser/sync/sync_service_factory.cc +@@ -75,7 +75,7 @@ + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || + // BUILDFLAG(IS_WIN) +@@ -116,7 +116,7 @@ std::unique_ptr<KeyedService> BuildSyncService( + // TODO(crbug.com/1052397): Reassess whether the following block needs to be + // included in lacros-chrome once build flag switch of lacros-chrome is + // complete. +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + syncer::SyncPrefs prefs(profile->GetPrefs()); + local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); +@@ -250,7 +250,7 @@ SyncServiceFactory::SyncServiceFactory() + DependsOn(ThemeServiceFactory::GetInstance()); + #endif // !BUILDFLAG(IS_ANDROID) + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + DependsOn(SavedTabGroupServiceFactory::GetInstance()); + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || + // BUILDFLAG(IS_WIN) diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h index 732085255991..ae27af8becc2 100644 --- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h +++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group.h.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/task_manager/sampling/task_group.h.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/task_manager/sampling/task_group.h -@@ -42,7 +42,7 @@ constexpr int kUnsupportedVMRefreshFlags = +@@ -43,7 +43,7 @@ constexpr int kUnsupportedVMRefreshFlags = REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE | REFRESH_TYPE_NACL | REFRESH_TYPE_IDLE_WAKEUPS | REFRESH_TYPE_HANDLES | REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | REFRESH_TYPE_PRIORITY | @@ -9,7 +9,7 @@ REFRESH_TYPE_FD_COUNT | #endif REFRESH_TYPE_HARD_FAULTS; -@@ -148,7 +148,7 @@ class TaskGroup { +@@ -149,7 +149,7 @@ class TaskGroup { } #endif // BUILDFLAG(ENABLE_NACL) @@ -18,7 +18,7 @@ int open_fd_count() const { return open_fd_count_; } void set_open_fd_count(int open_fd_count) { open_fd_count_ = open_fd_count; } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -168,7 +168,7 @@ class TaskGroup { +@@ -169,7 +169,7 @@ class TaskGroup { void RefreshNaClDebugStubPort(int child_process_unique_id); void OnRefreshNaClDebugStubPortDone(int port); #endif @@ -27,7 +27,7 @@ void OnOpenFdCountRefreshDone(int open_fd_count); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -240,7 +240,7 @@ class TaskGroup { +@@ -241,7 +241,7 @@ class TaskGroup { #if BUILDFLAG(ENABLE_NACL) int nacl_debug_stub_port_; #endif // BUILDFLAG(ENABLE_NACL) diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc index 2e937dc7d5f0..ca139cbcef5b 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 2022-12-01 10:35:46 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.cc @@ -45,7 +45,7 @@ TaskGroupSampler::TaskGroupSampler( const OnCpuRefreshCallback& on_cpu_refresh, @@ -18,7 +18,7 @@ on_open_fd_count_callback_(on_open_fd_count), #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) on_process_priority_callback_(on_process_priority) { -@@ -87,7 +87,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) +@@ -85,7 +85,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) base::BindOnce(on_swapped_mem_refresh_callback_)); } @@ -26,8 +26,8 @@ +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS, refresh_flags)) { - base::PostTaskAndReplyWithResult( -@@ -97,7 +97,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) + blocking_pool_runner_->PostTaskAndReplyWithResult( +@@ -95,7 +95,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) } #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -35,8 +35,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT, refresh_flags)) { - base::PostTaskAndReplyWithResult( -@@ -147,7 +147,7 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { + blocking_pool_runner_->PostTaskAndReplyWithResult( +@@ -144,7 +144,7 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { return process_metrics_->GetIdleWakeupsPerSecond(); } 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 1f45728b3628..c9925b0f5ae1 100644 --- a/www/iridium/files/patch-chrome_browser_themes_theme__service.cc +++ b/www/iridium/files/patch-chrome_browser_themes_theme__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/themes/theme_service.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/themes/theme_service.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/themes/theme_service.cc -@@ -72,7 +72,7 @@ +@@ -71,7 +71,7 @@ #include "extensions/browser/extension_registry_observer.h" #endif @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -314,7 +314,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() +@@ -313,7 +313,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() } bool ThemeService::ShouldUseCustomFrame() const { diff --git a/www/iridium/files/patch-chrome_browser_ui_browser.h b/www/iridium/files/patch-chrome_browser_ui_browser.h index a57d2b658ff3..5fb70586a2c5 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 2022-12-01 10:35:46 UTC +--- chrome/browser/ui/browser.h.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/browser.h -@@ -276,7 +276,7 @@ class Browser : public TabStripModelObserver, +@@ -280,7 +280,7 @@ class Browser : public TabStripModelObserver, int32_t restore_id = kDefaultRestoreId; #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 e725d0f4dac5..2392f0070a8a 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 2022-12-06 08:09:13 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -98,7 +98,7 @@ +@@ -105,7 +105,7 @@ #include "components/user_manager/user_manager.h" #endif @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -287,7 +287,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -294,7 +294,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } @@ -18,7 +18,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. auto* linux_ui = ui::LinuxUi::instance(); -@@ -532,7 +532,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -546,7 +546,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -1099,7 +1099,7 @@ void BrowserCommandController::InitCommandState() { +@@ -1101,7 +1101,7 @@ void BrowserCommandController::InitCommandState() { #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc index c44c4fc8d33a..265f4d7c36b2 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 2022-12-06 08:09:13 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/chrome_pages.cc -@@ -69,7 +69,7 @@ +@@ -68,7 +68,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -629,7 +629,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, +@@ -641,7 +641,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 7b0dc9c16933..d81cbde9e579 100644 --- a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h +++ b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/chrome_pages.h.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/ui/chrome_pages.h.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/chrome_pages.h -@@ -30,7 +30,7 @@ enum class ConsentLevel; +@@ -33,7 +33,7 @@ enum class ConsentLevel; } // namespace signin #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ namespace web_app { enum class AppSettingsPageEntryPoint; } // namespace web_app -@@ -218,7 +218,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, +@@ -225,7 +225,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_ui_signin__view__controller.cc b/www/iridium/files/patch-chrome_browser_ui_signin__view__controller.cc index 613522b2c373..d8ea5a10b6b5 100644 --- a/www/iridium/files/patch-chrome_browser_ui_signin__view__controller.cc +++ b/www/iridium/files/patch-chrome_browser_ui_signin__view__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/signin_view_controller.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/ui/signin_view_controller.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/signin_view_controller.cc -@@ -273,7 +273,7 @@ void SigninViewController::ShowModalEnterpriseConfirma +@@ -275,7 +275,7 @@ void SigninViewController::ShowModalEnterpriseConfirma SkColor profile_color, signin::SigninChoiceCallback callback) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 b123590d70c5..3b043dcd0a40 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,6 +1,6 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -93,7 +93,7 @@ static const char* kBadFlags[] = { +@@ -94,7 +94,7 @@ static const char* kBadFlags[] = { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/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 e3986d4c3b3f..96e4e1e3ef8c 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,4 +1,4 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc @@ -132,7 +132,7 @@ #include "chrome/credential_provider/common/gcp_strings.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/startup/web_app_info_recorder_utils.h" #endif -@@ -1011,7 +1011,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1006,7 +1006,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( silent_launch = true; } @@ -18,7 +18,7 @@ // Writes open and installed web apps to the specified file without // launching a new browser window or tab. if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) && -@@ -1203,7 +1203,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1198,7 +1198,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow) << "Failed launch with app: couldn't pick a profile"; std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId); diff --git a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc index 38cc412c92cb..911fb782273d 100644 --- a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc +++ b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -257,7 +257,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( +@@ -260,7 +260,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( // at the state of the MessageLoop. Browser::CreateParams params = Browser::CreateParams(profile_, false); params.creation_source = Browser::CreationSource::kStartupCreator; diff --git a/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc index 4aae2320cc21..432676c7e740 100644 --- a/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,21 +1,20 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -206,7 +206,7 @@ +@@ -205,7 +205,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - #include "chrome/browser/autofill_assistant/common_dependencies_chrome.h" - #include "chrome/browser/autofill_assistant/platform_dependencies_desktop.h" #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" -@@ -547,13 +547,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con - + #include "chrome/browser/ui/browser_finder.h" + #include "chrome/browser/ui/hats/hats_helper.h" +@@ -543,12 +543,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) metrics::DesktopSessionDurationObserver::CreateForWebContents(web_contents); #endif @@ -25,12 +24,3 @@ if (base::FeatureList::IsEnabled( features::kHappinessTrackingSurveysForDesktopDemo) || base::FeatureList::IsEnabled(features::kTrustSafetySentimentSurvey) || -@@ -576,7 +576,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled( - autofill_assistant::features::kAutofillAssistantDesktop)) { - autofill_assistant::CreateForWebContents( 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 1c81b7eeead0..8be259211625 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,6 +1,6 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc -@@ -455,7 +455,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r +@@ -454,7 +454,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r ? stringifier_->backgrounded_string() : stringifier_->foregrounded_string(); @@ -9,7 +9,7 @@ case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]); return fd_count >= 0 ? base::FormatNumber(fd_count) -@@ -622,7 +622,7 @@ int TaskManagerTableModel::CompareValues(size_t row1, +@@ -621,7 +621,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]); -@@ -796,7 +796,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col +@@ -795,7 +795,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col type = REFRESH_TYPE_KEEPALIVE_COUNT; break; 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 5d0093be1f60..402dfd2b66a1 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 2023-01-17 19:19:00 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/views/accelerator_table.cc -@@ -61,11 +61,11 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -65,11 +65,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}, -@@ -93,7 +93,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -97,7 +97,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}, -@@ -138,7 +138,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -142,7 +142,7 @@ const AcceleratorMapping kAcceleratorMap[] = { IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. @@ -32,12 +32,12 @@ {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK}, {ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD}, {ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME}, -@@ -237,7 +237,7 @@ const AcceleratorMapping kAcceleratorMap[] = { - {ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, IDC_TOGGLE_QUICK_COMMANDS}, +@@ -243,7 +243,7 @@ const AcceleratorMapping kAcceleratorMap[] = { #endif // !BUILDFLAG(IS_CHROMEOS) #endif // !BUILDFLAG(IS_MAC) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) {ui::VKEY_S, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_RUN_SCREEN_AI_VISUAL_ANNOTATIONS}, #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_views_bubble__anchor__util__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_bubble__anchor__util__views.cc deleted file mode 100644 index 1c021cc83920..000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_views_bubble__anchor__util__views.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/views/bubble_anchor_util_views.cc.orig 2022-12-06 08:09:13 UTC -+++ chrome/browser/ui/views/bubble_anchor_util_views.cc -@@ -39,7 +39,7 @@ AnchorConfiguration GetPageInfoAnchorConfiguration(Bro - views::BubbleBorder::TOP_LEFT}; - - // TODO(https://crbug.com/1346734): Enable this on all platforms. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (anchor == kLocationBar && browser_view->GetIsPictureInPictureType()) { - auto* frame_view = static_cast<PictureInPictureBrowserFrameView*>( - browser_view->frame()->GetFrameView()); 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 50bd95354152..eee2b1d17176 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,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/views/chrome_views_delegate.h -@@ -51,11 +51,11 @@ class ChromeViewsDelegate : public views::ViewsDelegat +@@ -54,11 +54,11 @@ class ChromeViewsDelegate : public views::ViewsDelegat base::OnceClosure callback) override; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 f0c079daa2db..d2e0b5121b44 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,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc -@@ -46,7 +46,7 @@ +@@ -47,7 +47,7 @@ #include "components/user_manager/user_manager.h" #endif @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #include "ui/linux/linux_ui.h" #endif -@@ -54,7 +54,7 @@ +@@ -55,7 +55,7 @@ namespace { bool IsUsingLinuxSystemTheme(Profile* profile) { @@ -18,7 +18,7 @@ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -270,7 +270,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -271,7 +271,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace()); chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(), IsVisibleOnAllWorkspaces()); @@ -27,7 +27,7 @@ // If the window was sent to a different workspace, prioritize it if // it was sent to the current workspace and deprioritize it // otherwise. This is done by MoveBrowsersInWorkspaceToFront() -@@ -393,7 +393,7 @@ void BrowserFrame::SelectNativeTheme() { +@@ -394,7 +394,7 @@ void BrowserFrame::SelectNativeTheme() { return; } @@ -36,7 +36,7 @@ const auto* linux_ui_theme = ui::LinuxUiTheme::GetForWindow(GetNativeWindow()); // Ignore the system theme for web apps with window-controls-overlay as the -@@ -410,7 +410,7 @@ void BrowserFrame::SelectNativeTheme() { +@@ -411,7 +411,7 @@ void BrowserFrame::SelectNativeTheme() { bool BrowserFrame::RegenerateFrameOnThemeChange( BrowserThemeChangeType theme_change_type) { bool need_regenerate = false; diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc index d4342ca80280..fcfc4ea6f76d 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc @@ -16,7 +16,7 @@ #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" @@ -18,12 +18,12 @@ auto* profile = browser_view->browser()->profile(); auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); -@@ -73,7 +73,7 @@ std::unique_ptr<BrowserNonClientFrameView> CreateBrows - BrowserFrame* frame, - BrowserView* browser_view) { - // TODO(https://crbug.com/1346734): Enable it on all platforms. --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +@@ -75,7 +75,7 @@ std::unique_ptr<BrowserNonClientFrameView> CreateBrows if (browser_view->browser()->is_type_picture_in_picture()) { auto view = std::make_unique<PictureInPictureBrowserFrameView>(frame, browser_view); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auto* profile = browser_view->browser()->profile(); + auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); + auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index 111df7829542..96eebf2b4c24 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,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2103,7 +2103,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2033,7 +2033,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra // CrOS cleanup is done. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/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 ef54e5ed5a56..5f446524e017 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 2022-12-01 10:35:46 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -55,7 +55,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" @@ -9,7 +9,7 @@ #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -557,7 +557,7 @@ OpaqueBrowserFrameView::FrameButtonStyle +@@ -555,7 +555,7 @@ OpaqueBrowserFrameView::FrameButtonStyle OpaqueBrowserFrameView::GetFrameButtonStyle() const { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ return FrameButtonStyle::kMdButton; #else return FrameButtonStyle::kImageButton; -@@ -580,7 +580,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh +@@ -578,7 +578,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh return false; } @@ -27,7 +27,7 @@ ui::WindowTiledEdges OpaqueBrowserFrameView::GetTiledEdges() const { return frame()->tiled_edges(); } -@@ -776,7 +776,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons +@@ -774,7 +774,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__layout__delegate.h b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h index 9bb6781b59aa..d726dab8180f 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h @@ -10,7 +10,7 @@ #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "ui/base/ui_base_types.h" #endif -@@ -96,7 +96,7 @@ class OpaqueBrowserFrameViewLayoutDelegate { +@@ -97,7 +97,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 6a4fbd43016a..8eff8ee21e44 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,25 +1,52 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc -@@ -32,7 +32,7 @@ +@@ -40,7 +40,7 @@ #include "ui/aura/window.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h" #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h" #endif +@@ -61,7 +61,7 @@ constexpr int kBackToTabImageSize = 16; + // The height of the controls bar at the top of the window. + constexpr int kTopControlsHeight = 30; -@@ -256,7 +256,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( - for (ContentSettingImageView* view : content_setting_views_) - view->SetIconColor(color_provider->GetColor(kColorOmniboxResultsIcon)); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Frame border when window shadow is not drawn. + constexpr int kFrameBorderThickness = 4; + #endif +@@ -151,7 +151,7 @@ class WindowEventObserver : public ui::EventObserver { + + gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // If the top bar background is already drawn by window_frame_provider_, skip - // drawing it again below. - if (window_frame_provider_) { -@@ -292,7 +292,7 @@ void PictureInPictureBrowserFrameView::AddedToWidget() - BrowserNonClientFrameView::AddedToWidget(); + // Calculate input bounds for Linux. This is needed because the input bounds + // is not necessary the same as the local bounds on Linux. + if (pip_browser_frame_view_->ShouldDrawFrameShadow()) { +@@ -341,7 +341,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow + hide_close_button_animation_.set_continuous(false); + hide_close_button_animation_.set_delegate(this); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + frame_background_ = std::make_unique<views::FrameBackground>(); + #endif + +@@ -460,7 +460,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( + for (ContentSettingImageView* view : content_setting_views_) + 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))); +@@ -505,7 +505,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg + BrowserNonClientFrameView::RemovedFromWidget(); } -#if BUILDFLAG(IS_LINUX) @@ -27,16 +54,16 @@ gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -494,7 +494,7 @@ void PictureInPictureBrowserFrameView::OnMouseEvent(ui - /////////////////////////////////////////////////////////////////////////////// +@@ -710,7 +710,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre // views::View implementations: + void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Draw the PiP window frame borders and shadows, including the top bar + // background. if (window_frame_provider_) { - // Draw the PiP window frame borders and shadows, including the top bar - // background. -@@ -562,7 +562,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -833,7 +833,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie } gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const { @@ -45,7 +72,16 @@ if (window_frame_provider_) { const auto insets = window_frame_provider_->GetFrameThicknessDip(); const auto tiled_edges = frame()->tiled_edges(); -@@ -582,7 +582,7 @@ int PictureInPictureBrowserFrameView::GetTopAreaHeight +@@ -854,7 +854,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor + } + + gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return FrameBorderInsets(); + #else + return gfx::Insets(kResizeBorder); +@@ -865,7 +865,7 @@ int PictureInPictureBrowserFrameView::GetTopAreaHeight return FrameBorderInsets().top() + kTopControlsHeight; } @@ -53,4 +89,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void PictureInPictureBrowserFrameView::SetWindowFrameProvider( ui::WindowFrameProvider* window_frame_provider) { - window_frame_provider_ = window_frame_provider; + DCHECK(window_frame_provider); 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 00c945b6d52e..b8935de5c0cb 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h @@ -1,7 +1,7 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h @@ -20,7 +20,7 @@ - #include "ui/views/layout/box_layout_view.h" + #include "ui/views/controls/image_view.h" #include "ui/views/widget/widget_observer.h" -#if BUILDFLAG(IS_LINUX) @@ -9,27 +9,27 @@ #include "ui/linux/window_frame_provider.h" #endif -@@ -67,7 +67,7 @@ class PictureInPictureBrowserFrameView - void OnThemeChanged() override; +@@ -74,7 +74,7 @@ class PictureInPictureBrowserFrameView void Layout() override; void AddedToWidget() override; + void RemovedFromWidget() override; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) gfx::Insets MirroredFrameBorderInsets() const override; gfx::Insets GetInputInsets() const override; SkRRect GetRestoredClipRegion() const override; -@@ -145,7 +145,7 @@ class PictureInPictureBrowserFrameView - // Returns the height of the top bar area, including the window top border. - int GetTopAreaHeight() const; +@@ -155,7 +155,7 @@ class PictureInPictureBrowserFrameView + // Called when mouse entered or exited the pip window. + void OnMouseEnteredOrExitedWindow(bool entered); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Sets the window frame provider so that it will be used for drawing. void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider); -@@ -177,7 +177,7 @@ class PictureInPictureBrowserFrameView - widget_observation_{this}; - bool mouse_inside_window_ = false; +@@ -218,7 +218,7 @@ class PictureInPictureBrowserFrameView + gfx::MultiAnimation show_close_button_animation_; + gfx::MultiAnimation hide_close_button_animation_; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc index def300fa7f28..b6b45c251e50 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 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/views/hung_renderer_view.cc -@@ -401,7 +401,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() +@@ -404,7 +404,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_profiles_signin__view__controller__delegate__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc index 30b28d707066..8955616f1c8f 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,4 +1,4 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc @@ -50,7 +50,7 @@ namespace { @@ -18,7 +18,7 @@ // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView( -@@ -456,7 +456,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati +@@ -447,7 +447,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc index 57ff9ece936c..23ae2b7e9ae1 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/views/tabs/new_tab_button.cc -@@ -59,7 +59,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, Presse +@@ -61,7 +61,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, Presse SetAnimateOnStateChange(true); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/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 4d851b7410b3..809e9cd12f0c 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 2023-01-17 19:19:00 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -82,7 +82,7 @@ +@@ -81,7 +81,7 @@ #include "components/remote_cocoa/browser/window.h" #endif @@ -9,7 +9,7 @@ #include "ui/aura/client/drag_drop_client.h" #endif -@@ -254,7 +254,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { +@@ -259,7 +259,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { void UpdateSystemDnDDragImage(TabDragContext* attached_context, const gfx::ImageSkia& image) { @@ -18,7 +18,7 @@ aura::Window* root_window = attached_context->GetWidget()->GetNativeWindow()->GetRootWindow(); if (aura::client::GetDragDropClient(root_window)) { -@@ -506,7 +506,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -511,7 +511,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. // - Chrome OS // Releasing capture on Ash cancels gestures so avoid it. @@ -27,7 +27,7 @@ can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); -@@ -1106,7 +1106,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -1112,7 +1112,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +36,7 @@ // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -2097,7 +2097,7 @@ void TabDragController::CompleteDrag() { +@@ -2106,7 +2106,7 @@ void TabDragController::CompleteDrag() { } // If source window was maximized - maximize the new window as well. @@ -45,7 +45,7 @@ // Keeping maximized state breaks snap to Grid on Windows when dragging // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in -@@ -2488,7 +2488,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2500,7 +2500,7 @@ TabDragController::Liveness TabDragController::GetLoca } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/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 new file mode 100644 index 000000000000..cd5ecd49b60a --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc @@ -0,0 +1,110 @@ +--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-03-13 07:33:08 UTC ++++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc +@@ -385,7 +385,7 @@ std::string GetFileExtension(FileExtension file_extens + } + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) { + SiteConfig config; + bool is_app_found = false; +@@ -559,7 +559,7 @@ std::vector<std::wstring> GetFileExtensionsForProgId( + } + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + bool IconManagerCheckIconTopLeftColor(WebAppIconManager& icon_manager, + const AppId& app_id, + std::vector<int> sizes_px, +@@ -890,7 +890,7 @@ void WebAppIntegrationTestDriver::TearDownOnMainThread + LOG(INFO) << "TearDownOnMainThread: Deleting dangling shortcuts."; + // TODO(crbug.com/1273568): Investigate the true source of flakiness instead + // of papering over it here. +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ASSERT_TRUE(override_registration_->test_override->ForceDeleteAllShortcuts()); + #endif + LOG(INFO) +@@ -1637,7 +1637,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc + if (app_name.empty()) { + app_name = GetSiteConfiguration(site).app_name; + } +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ASSERT_TRUE(override_registration_->test_override->IsShortcutCreated( + profile(), app_id, app_name)); + ASSERT_TRUE( +@@ -2591,7 +2591,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna + app_state->id, app_state->name); + ASSERT_TRUE(icon_color.has_value()); + ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value())); +-#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ASSERT_TRUE(override_registration_->test_override->IsRunOnOsLoginEnabled( + profile(), app_state->id, app_state->name)); + #endif +@@ -2605,7 +2605,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis + GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site); + ASSERT_TRUE(app_state); + base::ScopedAllowBlockingForTesting allow_blocking; +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ASSERT_FALSE(override_registration_->test_override->IsRunOnOsLoginEnabled( + profile(), app_state->id, app_state->name)); + #endif +@@ -2615,7 +2615,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis + void WebAppIntegrationTestDriver::CheckSiteHandlesFile( + Site site, + FileExtension file_extension) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (!BeforeStateCheckAction(__FUNCTION__)) + return; + ASSERT_TRUE(IsFileHandledBySite(site, file_extension)); +@@ -2626,7 +2626,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile + void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile( + Site site, + FileExtension file_extension) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (!BeforeStateCheckAction(__FUNCTION__)) + return; + ASSERT_FALSE(IsFileHandledBySite(site, file_extension)); +@@ -3137,7 +3137,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu + base::FilePath shortcut_dir, + const std::string& app_name, + const AppId& app_id) { +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + return override_registration_->test_override->GetShortcutPath( + profile(), shortcut_dir, app_id, app_name); + #else +@@ -3307,7 +3307,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre + const AppId& id) { + base::ScopedAllowBlockingForTesting allow_blocking; + bool is_shortcut_and_icon_correct = false; +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool is_shortcut_correct = + override_registration_->test_override->IsShortcutCreated(profile, id, + name); +@@ -3351,7 +3351,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr + do_icon_colors_match = + (expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value()); + } +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + SkColor expected_icon_pixel_color = + GetSiteConfigurationFromAppName(name).icon_color; + do_icon_colors_match = IconManagerCheckIconTopLeftColor( +@@ -3404,7 +3404,7 @@ bool WebAppIntegrationTestDriver::IsFileHandledBySite( + app_id); + is_file_handled = + shell_integration::CanApplicationHandleURL(app_path, test_file_url); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + AppId app_id = GetAppIdBySiteMode(site); + for (const LinuxFileRegistration& command : + override_registration_->test_override->linux_file_registration()) { diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc index 0b4acf1e5cf3..c9c9876e3bf8 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/webui/about_ui.cc -@@ -620,7 +620,7 @@ std::string ChromeURLs() { +@@ -603,7 +603,7 @@ std::string ChromeURLs() { return html; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, -@@ -678,7 +678,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -657,7 +657,7 @@ void AboutUIHTMLSource::StartDataRequest( response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr); } diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc new file mode 100644 index 000000000000..2d440ef047db --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2023-03-13 07:33:08 UTC ++++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc +@@ -392,7 +392,7 @@ void AppHomePageHandler::FillExtensionInfoList( + bool is_deprecated_app = false; + auto* context = extension_service_->GetBrowserContext(); + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + is_deprecated_app = extensions::IsExtensionUnsupportedDeprecatedApp( + context, extension->id()); + #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index 7bb370cd1edd..e2a80b9a86c9 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 2023-01-17 19:19:00 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -319,7 +319,7 @@ +@@ -325,7 +325,7 @@ #include "chrome/browser/ui/webui/app_launcher_page_ui.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" #endif -@@ -345,17 +345,17 @@ +@@ -351,17 +351,17 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -30,7 +30,7 @@ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #endif -@@ -716,7 +716,7 @@ bool IsAboutUI(const GURL& url) { +@@ -721,7 +721,7 @@ bool IsAboutUI(const GURL& url) { #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -39,7 +39,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1024,7 +1024,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1017,7 +1017,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI<ash::personalization_app::PersonalizationAppUI>; } #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -48,7 +48,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -1085,7 +1085,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1075,7 +1075,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -57,7 +57,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -1145,27 +1145,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1139,27 +1139,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc b/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc index a63b2a90eb2e..9ddbc07fac8e 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc @@ -6,7 +6,7 @@ @@ -18,7 +18,7 @@ connectors_internals::mojom::KeyTrustLevel ParseTrustLevel( BPKUR::KeyTrustLevel trust_level) { -@@ -70,7 +70,7 @@ connectors_internals::mojom::Int32ValuePtr ToMojomValu +@@ -92,7 +92,7 @@ connectors_internals::mojom::Int32ValuePtr ToMojomValu } // namespace connectors_internals::mojom::KeyInfoPtr GetKeyInfo() { diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui.cc b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui.cc new file mode 100644 index 000000000000..121e1dba34aa --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/webui/management/management_ui.cc.orig 2023-03-13 07:33:08 UTC ++++ chrome/browser/ui/webui/management/management_ui.cc +@@ -92,7 +92,7 @@ content::WebUIDataSource* CreateAndAddManagementUIHtml + {kManagementOnFileTransferVisibleData, + IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA}, + #endif // BUILDFLAG(IS_CHROMEOS) +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + {kManagementScreenCaptureEvent, IDS_MANAGEMENT_SCREEN_CAPTURE_EVENT}, + {kManagementScreenCaptureData, IDS_MANAGEMENT_SCREEN_CAPTURE_DATA}, + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc new file mode 100644 index 000000000000..6eb587b686e9 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2023-03-13 07:33:08 UTC ++++ chrome/browser/ui/webui/management/management_ui_handler.cc +@@ -171,7 +171,7 @@ enum class ReportingType { + kUserActivity + }; + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const char kManagementScreenCaptureEvent[] = "managementScreenCaptureEvent"; + const char kManagementScreenCaptureData[] = "managementScreenCaptureData"; + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +@@ -973,7 +973,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec + kManagementOnPageVisitedVisibleData, &info); + } + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (capture_policy::IsGetDisplayMediaSetSelectAllScreensAllowedForAnySite( + profile)) { + AddThreatProtectionPermission(kManagementScreenCaptureEvent, 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 new file mode 100644 index 000000000000..477d73f42227 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h @@ -0,0 +1,11 @@ +--- chrome/browser/ui/webui/management/management_ui_handler.h.orig 2023-03-13 07:33:08 UTC ++++ chrome/browser/ui/webui/management/management_ui_handler.h +@@ -24,7 +24,7 @@ + #include "extensions/common/extension_id.h" + #include "url/gurl.h" + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Constants defining the IDs for the localized strings sent to the page as + // load time data. + extern const char kManagementScreenCaptureEvent[]; diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc index ca3a23719f4e..08eeda5a5ad6 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc -@@ -326,7 +326,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI +@@ -323,7 +323,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI bool is_deprecated_app = false; auto* context = extension_service_->GetBrowserContext(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,12 +9,3 @@ is_deprecated_app = extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id()); #endif -@@ -1444,7 +1444,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: - options.os_hooks[web_app::OsHookType::kUninstallationViaOsSettings] = - web_app->CanUserUninstallWebApp(); - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) - options.os_hooks[web_app::OsHookType::kUrlHandlers] = true; - #else diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index 67afe3ef44ae..d2595e386e24 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,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -122,7 +122,7 @@ +@@ -125,7 +125,7 @@ #include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h" #endif @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -143,7 +143,7 @@ +@@ -145,7 +145,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 -@@ -229,7 +229,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s +@@ -233,7 +233,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s #endif html_source->AddBoolean("isChildAccount", profile->IsChild()); @@ -27,7 +27,7 @@ bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt); #else bool allow_qt_theme = false; -@@ -382,7 +382,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -379,7 +379,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, {"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT}, {"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT}, @@ -36,7 +36,7 @@ {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -392,7 +392,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -389,7 +389,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif @@ -45,7 +45,7 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -416,7 +416,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -411,7 +411,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/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 e93180eb7ff2..7a1578eb6967 100644 --- a/www/iridium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc +++ b/www/iridium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/window_sizer/window_sizer.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/ui/window_sizer/window_sizer.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/ui/window_sizer/window_sizer.cc -@@ -205,7 +205,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( +@@ -203,7 +203,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( browser, window_bounds, show_state); } diff --git a/www/iridium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc b/www/iridium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc new file mode 100644 index 000000000000..a9bcb66cc72c --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc @@ -0,0 +1,11 @@ +--- chrome/browser/web_applications/commands/install_app_locally_command.cc.orig 2023-03-13 07:33:08 UTC ++++ chrome/browser/web_applications/commands/install_app_locally_command.cc +@@ -84,7 +84,7 @@ void InstallAppLocallyCommand::StartWithLock( + options.os_hooks[OsHookType::kUninstallationViaOsSettings] = + web_app->CanUserUninstallWebApp(); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) + options.os_hooks[web_app::OsHookType::kUrlHandlers] = true; + #else diff --git a/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc b/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc index 8e7fe819dc43..30d3656a2eb5 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc +++ b/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/web_applications/extensions/extension_status_utils.cc @@ -26,7 +26,7 @@ namespace { const char* g_preinstalled_app_for_testing = nullptr; @@ -6,10 +6,10 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - const char kMobilityPrintExtensionId[] = "alhngdkjgnedakdlnamimgfihgkmenbh"; - - BASE_FEATURE(kChromeAppsDeprecationExcludeForceInstalls, -@@ -108,7 +108,7 @@ bool ClearExternalExtensionUninstalled(content::Browse + // TODO(b/268221237): Remove this allow-list. + const char kDefaultAllowedExtensionIds[] = + "alhngdkjgnedakdlnamimgfihgkmenbh," +@@ -113,7 +113,7 @@ bool ClearExternalExtensionUninstalled(content::Browse } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.cc b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.cc new file mode 100644 index 000000000000..1d5d3c3dcdd1 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.cc @@ -0,0 +1,92 @@ +--- chrome/browser/web_applications/os_integration/os_integration_test_override.cc.orig 2023-03-13 07:33:08 UTC ++++ chrome/browser/web_applications/os_integration/os_integration_test_override.cc +@@ -147,7 +147,7 @@ bool OsIntegrationTestOverride::IsRunOnOsLoginEnabled( + Profile* profile, + const AppId& app_id, + const std::string& app_name) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::string shortcut_filename = + "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop"; + return base::PathExists(startup().Append(shortcut_filename)); +@@ -217,7 +217,7 @@ base::FilePath OsIntegrationTestOverride::GetShortcutP + app_installed_profiles.end()) { + return shortcut_path; + } +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::string shortcut_filename = + "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop"; + base::FilePath shortcut_path = shortcut_dir.Append(shortcut_filename); +@@ -242,7 +242,7 @@ bool OsIntegrationTestOverride::IsShortcutCreated(Prof + base::FilePath app_shortcut_path = + GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name); + return base::PathExists(app_shortcut_path); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FilePath desktop_shortcut_path = + GetShortcutPath(profile, desktop(), app_id, app_name); + return base::PathExists(desktop_shortcut_path); +@@ -270,7 +270,7 @@ bool OsIntegrationTestOverride::SimulateDeleteShortcut + GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name); + DCHECK(base::PathExists(app_folder_shortcut_path)); + return base::DeletePathRecursively(app_folder_shortcut_path); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FilePath desktop_shortcut_path = + GetShortcutPath(profile, desktop(), app_id, app_name); + LOG(INFO) << desktop_shortcut_path; +@@ -287,7 +287,7 @@ bool OsIntegrationTestOverride::ForceDeleteAllShortcut + return DeleteDesktopDirOnWin() && DeleteApplicationMenuDirOnWin(); + #elif BUILDFLAG(IS_MAC) + return DeleteChromeAppsDir(); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return DeleteDesktopDirOnLinux(); + #else + NOTREACHED() << "Not implemented on ChromeOS/Fuchsia "; +@@ -327,7 +327,7 @@ void OsIntegrationTestOverride::EnableOrDisablePathOnL + startup_enabled_[file_path] = enable_on_login; + } + +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool OsIntegrationTestOverride::DeleteDesktopDirOnLinux() { + if (desktop_.IsValid()) { + return desktop_.Delete(); +@@ -360,7 +360,7 @@ OsIntegrationTestOverride::OsIntegrationTestOverride( + #elif BUILDFLAG(IS_MAC) + bool success = chrome_apps_folder_.CreateUniqueTempDirUnderPath(base_path); + DCHECK(success); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool success = desktop_.CreateUniqueTempDirUnderPath(base_path); + DCHECK(success); + success = startup_.CreateUniqueTempDirUnderPath(base_path); +@@ -379,7 +379,7 @@ OsIntegrationTestOverride::OsIntegrationTestOverride( + #elif BUILDFLAG(IS_MAC) + bool success = chrome_apps_folder_.CreateUniqueTempDir(); + DCHECK(success); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool success = desktop_.CreateUniqueTempDir(); + DCHECK(success); + success = startup_.CreateUniqueTempDir(); +@@ -387,7 +387,7 @@ OsIntegrationTestOverride::OsIntegrationTestOverride( + #endif + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auto callback = + base::BindRepeating([](base::FilePath filename, std::string xdg_command, + std::string file_contents) { +@@ -421,7 +421,7 @@ OsIntegrationTestOverride::~OsIntegrationTestOverride( + } + } + } +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Reset the file handling callback. + SetUpdateMimeInfoDatabaseOnLinuxCallbackForTesting( + UpdateMimeInfoDatabaseOnLinuxCallback()); diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h new file mode 100644 index 000000000000..721b265885db --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h @@ -0,0 +1,29 @@ +--- chrome/browser/web_applications/os_integration/os_integration_test_override.h.orig 2023-03-13 07:33:08 UTC ++++ chrome/browser/web_applications/os_integration/os_integration_test_override.h +@@ -23,7 +23,7 @@ class Profile; + + namespace web_app { + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + struct LinuxFileRegistration { + std::string xdg_command; + std::string file_contents; +@@ -145,7 +145,7 @@ class OsIntegrationTestOverride + } + void EnableOrDisablePathOnLogin(const base::FilePath& file_path, + bool enable_on_login); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool DeleteDesktopDirOnLinux(); + const base::FilePath& desktop() { return desktop_.GetPath(); } + const base::FilePath& startup() { return startup_.GetPath(); } +@@ -184,7 +184,7 @@ class OsIntegrationTestOverride + #elif BUILDFLAG(IS_MAC) + base::ScopedTempDir chrome_apps_folder_; + std::map<base::FilePath, bool> startup_enabled_; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::ScopedTempDir desktop_; + base::ScopedTempDir startup_; + std::vector<LinuxFileRegistration> linux_file_registration_; diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc new file mode 100644 index 000000000000..75498413c8dd --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc @@ -0,0 +1,11 @@ +--- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig 2023-03-13 07:33:08 UTC ++++ chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc +@@ -226,7 +226,7 @@ void ShortcutSubManager::Execute( + return; + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + // Protocol handler update detection. Shortcuts need to be updated in this + // case on Linux & Mac because the shortcut itself includes the protocol + // handling metadata. 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 bb4100b8743c..13e311e7f97d 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,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut.cc -@@ -54,7 +54,7 @@ namespace { +@@ -52,7 +52,7 @@ namespace { #if BUILDFLAG(IS_MAC) const int kDesiredIconSizesForShortcut[] = {16, 32, 128, 256, 512}; @@ -9,39 +9,3 @@ // 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}; -@@ -207,7 +207,7 @@ ShortcutOverrideForTesting::ShortcutOverrideForTesting - #elif BUILDFLAG(IS_MAC) - bool success = chrome_apps_folder.CreateUniqueTempDirUnderPath(base_path); - DCHECK(success); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - bool success = desktop.CreateUniqueTempDirUnderPath(base_path); - DCHECK(success); - success = startup.CreateUniqueTempDirUnderPath(base_path); -@@ -226,7 +226,7 @@ ShortcutOverrideForTesting::ShortcutOverrideForTesting - #elif BUILDFLAG(IS_MAC) - bool success = chrome_apps_folder.CreateUniqueTempDir(); - DCHECK(success); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - bool success = desktop.CreateUniqueTempDir(); - DCHECK(success); - success = startup.CreateUniqueTempDir(); -@@ -234,7 +234,7 @@ ShortcutOverrideForTesting::ShortcutOverrideForTesting - #endif - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - auto callback = - base::BindRepeating([](base::FilePath filename, std::string xdg_command, - std::string file_contents) { -@@ -267,7 +267,7 @@ ShortcutOverrideForTesting::~ShortcutOverrideForTestin - } - } - } --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Reset the file handling callback. - SetUpdateMimeInfoDatabaseOnLinuxCallbackForTesting( - UpdateMimeInfoDatabaseOnLinuxCallback()); 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 20ce17fab01b..f449817fb4a6 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 2023-01-17 19:19:00 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut.h -@@ -21,7 +21,7 @@ +@@ -20,7 +20,7 @@ #include "ui/gfx/image/image_family.h" #include "url/gurl.h" @@ -9,25 +9,7 @@ #include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h" #endif // BUILDFLAG(IS_LINUX) -@@ -39,7 +39,7 @@ class ImageSkia; - - namespace web_app { - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - struct LinuxFileRegistration { - std::string xdg_command; - std::string file_contents; -@@ -89,7 +89,7 @@ struct ShortcutOverrideForTesting - #elif BUILDFLAG(IS_MAC) - base::ScopedTempDir chrome_apps_folder; - std::map<base::FilePath, bool> startup_enabled; --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::ScopedTempDir desktop; - base::ScopedTempDir startup; - std::vector<LinuxFileRegistration> linux_file_registration; -@@ -136,7 +136,7 @@ struct ShortcutInfo { +@@ -66,7 +66,7 @@ struct ShortcutInfo { std::set<std::string> file_handler_extensions; std::set<std::string> file_handler_mime_types; std::set<std::string> protocol_handlers; diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc index 27644a327bd6..d76fd53ec2ca 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc +++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc -@@ -449,7 +449,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B +@@ -452,7 +452,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B } } 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 7a6a2d41920e..7ef9855e634d 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 2023-01-17 19:19:00 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -679,7 +679,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl +@@ -590,7 +590,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl g_observer->ConfiguringCable(request_type); } diff --git a/www/iridium/files/patch-chrome_common_chrome__features.cc b/www/iridium/files/patch-chrome_common_chrome__features.cc index a55cfa508017..2aece57cade1 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 2023-01-17 19:19:00 UTC +--- chrome/common/chrome_features.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/common/chrome_features.cc -@@ -108,7 +108,7 @@ BASE_FEATURE(kAsyncDns, +@@ -82,7 +82,7 @@ BASE_FEATURE(kAsyncDns, ); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // Enables or disables the Autofill survey triggered by opening a prompt to // save address info. BASE_FEATURE(kAutofillAddressSurvey, -@@ -126,7 +126,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, +@@ -100,7 +100,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. -@@ -310,7 +310,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, +@@ -284,7 +284,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, // Enables or disables Desktop PWAs to be auto-started on OS login. BASE_FEATURE(kDesktopPWAsRunOnOsLogin, "DesktopPWAsRunOnOsLogin", @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -334,7 +334,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles, +@@ -308,7 +308,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles, base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ // Controls whether Chrome Apps are supported. See https://crbug.com/1221251. // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome // Apps will not launch and will be marked in the UI as deprecated. -@@ -358,7 +358,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati +@@ -335,7 +335,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati BASE_FEATURE(kDnsOverHttps, "DnsOverHttps", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -45,7 +45,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -374,7 +374,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa +@@ -351,7 +351,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa const base::FeatureParam<bool> kDnsOverHttpsShowUiParam { &kDnsOverHttps, "ShowUi", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -54,7 +54,7 @@ true #else false -@@ -750,7 +750,7 @@ BASE_FEATURE(kUpdateHistoryEntryPointsInIncognito, +@@ -736,7 +736,7 @@ BASE_FEATURE(kUpdateHistoryEntryPointsInIncognito, "UpdateHistoryEntryPointsInIncognito", base::FEATURE_ENABLED_BY_DEFAULT); @@ -63,7 +63,7 @@ BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -763,7 +763,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -749,7 +749,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 b63585d38391..44c6a1717953 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 2022-12-06 08:09:13 UTC +--- chrome/common/chrome_features.h.orig 2023-03-13 07:33:08 UTC +++ chrome/common/chrome_features.h -@@ -81,13 +81,13 @@ BASE_DECLARE_FEATURE(kAppShimNewCloseBehavior); +@@ -64,13 +64,13 @@ BASE_DECLARE_FEATURE(kAppShimNewCloseBehavior); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAsyncDns); #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) -@@ -189,7 +189,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); +@@ -176,7 +176,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsWebBundles); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -25,7 +25,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kKeepForceInstalledPreinstalledApps); -@@ -432,7 +432,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); +@@ -422,7 +422,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceStorage); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kUpdateHistoryEntryPointsInIncognito); @@ -34,7 +34,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor); COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel; -@@ -440,7 +440,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -430,7 +430,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__switches.cc b/www/iridium/files/patch-chrome_common_chrome__switches.cc index 8806bc555496..a630d6802474 100644 --- a/www/iridium/files/patch-chrome_common_chrome__switches.cc +++ b/www/iridium/files/patch-chrome_common_chrome__switches.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/common/chrome_switches.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/common/chrome_switches.cc -@@ -839,14 +839,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -855,14 +855,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_common_chrome__switches.h b/www/iridium/files/patch-chrome_common_chrome__switches.h index b1a80b3917aa..20dd1f8eed71 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 2023-01-17 19:19:00 UTC +--- chrome/common/chrome_switches.h.orig 2023-03-13 07:33:08 UTC +++ chrome/common/chrome_switches.h -@@ -263,12 +263,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -265,12 +265,12 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ 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 ad32c0c1b2ee..5e89b583ca02 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,6 +1,6 @@ ---- chrome/common/media/cdm_host_file_path.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/common/media/cdm_host_file_path.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/common/media/cdm_host_file_path.cc -@@ -91,7 +91,7 @@ void AddCdmHostFilePaths( +@@ -90,7 +90,7 @@ void AddCdmHostFilePaths( cdm_host_file_paths->emplace_back(chrome_framework_path, chrome_framework_sig_path); diff --git a/www/iridium/files/patch-chrome_common_pref__names.cc b/www/iridium/files/patch-chrome_common_pref__names.cc index 7a7b82a5fb2b..9b9b3a6bfb30 100644 --- a/www/iridium/files/patch-chrome_common_pref__names.cc +++ b/www/iridium/files/patch-chrome_common_pref__names.cc @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/common/pref_names.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/common/pref_names.cc -@@ -1268,7 +1268,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox +@@ -1222,7 +1222,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. const char kUsesSystemThemeDeprecated[] = "extensions.theme.use_system"; const char kSystemTheme[] = "extensions.theme.system_theme"; -@@ -1382,7 +1382,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1341,7 +1341,7 @@ const char kShowUpdatePromotionInfoBar[] = // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -1893,7 +1893,7 @@ const char kDownloadDirUpgraded[] = "download.director +@@ -1852,7 +1852,7 @@ const char kDownloadDirUpgraded[] = "download.director const char kDownloadLastCompleteTime[] = "download.last_complete_time"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +27,7 @@ const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -2197,7 +2197,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i +@@ -2166,7 +2166,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i // its isolation requirements. const char kWebAppsIsolationState[] = "web_apps.isolation_state"; @@ -36,7 +36,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) // Dictionary that maps origins to web apps that can act as URL handlers. const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info"; -@@ -2297,7 +2297,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled +@@ -2266,7 +2266,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled // requests. const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -45,7 +45,7 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. const char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3300,7 +3300,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto +@@ -3303,7 +3303,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto const char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -54,3 +54,12 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. const char kAllowSystemNotifications[] = "system_notifications.allowed"; +@@ -3674,7 +3674,7 @@ const char kThrottleNonVisibleCrossOriginIframesAllowe + const char kNewBaseUrlInheritanceBehaviorAllowed[] = + "new_base_url_inheritance_behavior_allowed"; + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // If this exists and is true, Chrome may run system DNS resolution out of the + // network process. If false, Chrome will run system DNS resolution in the + // network process. If non-existent, Chrome will decide where to run system DNS diff --git a/www/iridium/files/patch-chrome_common_pref__names.h b/www/iridium/files/patch-chrome_common_pref__names.h index e24949877804..eb48fc8827c7 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 2023-01-17 19:19:00 UTC +--- chrome/common/pref_names.h.orig 2023-03-13 07:33:08 UTC +++ chrome/common/pref_names.h -@@ -398,7 +398,7 @@ extern const char kUseAshProxy[]; +@@ -390,7 +390,7 @@ extern const char kUseAshProxy[]; #endif // BUILDFLAG(IS_CHROMEOS_LACROS) // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // TODO(https://crbug.com/1317782): Remove in M110. extern const char kUsesSystemThemeDeprecated[]; extern const char kSystemTheme[]; -@@ -425,7 +425,7 @@ extern const char kShowUpdatePromotionInfoBar[]; +@@ -417,7 +417,7 @@ extern const char kShowUpdatePromotionInfoBar[]; #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ extern const char kUseCustomChromeFrame[]; #endif #if BUILDFLAG(ENABLE_PLUGINS) -@@ -616,7 +616,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[ +@@ -608,7 +608,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[ extern const char kDownloadDirUpgraded[]; extern const char kDownloadLastCompleteTime[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +27,7 @@ extern const char kOpenPdfDownloadInSystemReader[]; #endif #if BUILDFLAG(IS_ANDROID) -@@ -728,7 +728,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps +@@ -723,7 +723,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps extern const char kWebAppsPreferences[]; extern const char kWebAppsIsolationState[]; @@ -36,7 +36,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) extern const char kWebAppsUrlHandlerInfo[]; #endif -@@ -859,7 +859,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] +@@ -854,7 +854,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] extern const char kAmbientAuthenticationInPrivateModesEnabled[]; extern const char kBasicAuthOverHttpEnabled[]; @@ -45,7 +45,7 @@ extern const char kAuthNegotiateDelegateByKdcPolicy[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -1128,7 +1128,7 @@ extern const char kBlockAutoplayEnabled[]; +@@ -1133,7 +1133,7 @@ extern const char kBlockAutoplayEnabled[]; #endif extern const char kSandboxExternalProtocolBlocked[]; @@ -54,3 +54,12 @@ extern const char kAllowSystemNotifications[]; #endif +@@ -1303,7 +1303,7 @@ extern const char kDIPSTimerLastUpdate[]; + extern const char kThrottleNonVisibleCrossOriginIframesAllowed[]; + extern const char kNewBaseUrlInheritanceBehaviorAllowed[]; + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + extern const char kOutOfProcessSystemDnsResolutionEnabled[]; + #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) + diff --git a/www/iridium/files/patch-chrome_common_url__constants.cc b/www/iridium/files/patch-chrome_common_url__constants.cc index 00a9a035d4e0..b4a7ef6a11f4 100644 --- a/www/iridium/files/patch-chrome_common_url__constants.cc +++ b/www/iridium/files/patch-chrome_common_url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/url_constants.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/common/url_constants.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/common/url_constants.cc -@@ -498,7 +498,7 @@ const char kPhoneHubPermissionLearnMoreURL[] = +@@ -513,7 +513,7 @@ const char kPhoneHubPermissionLearnMoreURL[] = "https://support.google.com/chromebook/?p=multidevice"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_common_url__constants.h b/www/iridium/files/patch-chrome_common_url__constants.h index 47ccfef9bdd9..f6fdf0d133a6 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 2022-12-06 08:09:13 UTC +--- chrome/common/url_constants.h.orig 2023-03-13 07:33:08 UTC +++ chrome/common/url_constants.h -@@ -471,7 +471,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; +@@ -488,7 +488,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; extern const char kPhoneHubPermissionLearnMoreURL[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 e5b7074e258f..c71626736730 100644 --- a/www/iridium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/iridium/files/patch-chrome_common_webui__url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/common/webui_url_constants.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/common/webui_url_constants.cc -@@ -487,18 +487,18 @@ const char kOsUIScanningAppURL[] = "os://scanning"; +@@ -497,18 +497,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os:// const char kOsUIVersionURL[] = "os://version"; #endif @@ -22,7 +22,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -@@ -513,14 +513,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr +@@ -523,14 +523,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -39,7 +39,7 @@ const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; const char kChromeUIEnterpriseProfileWelcomeHost[] = -@@ -537,7 +537,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro +@@ -547,7 +547,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif @@ -48,7 +48,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; -@@ -613,7 +613,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan +@@ -625,7 +625,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -57,7 +57,7 @@ const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; const char kChromeUIWebAppSettingsHost[] = "app-settings"; #endif -@@ -827,7 +827,7 @@ const char* const kChromeDebugURLs[] = { +@@ -839,7 +839,7 @@ const char* const kChromeDebugURLs[] = { blink::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif diff --git a/www/iridium/files/patch-chrome_common_webui__url__constants.h b/www/iridium/files/patch-chrome_common_webui__url__constants.h index d056d3aa1018..959dd6e9ed5f 100644 --- a/www/iridium/files/patch-chrome_common_webui__url__constants.h +++ b/www/iridium/files/patch-chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.h.orig 2023-01-17 19:19:00 UTC +--- chrome/common/webui_url_constants.h.orig 2023-03-13 07:33:08 UTC +++ chrome/common/webui_url_constants.h -@@ -414,24 +414,24 @@ extern const char kOsUIScanningAppURL[]; +@@ -419,24 +419,24 @@ extern const char kOsUIShortcutCustomizationAppURL[]; extern const char kOsUIVersionURL[]; #endif @@ -29,7 +29,7 @@ extern const char kChromeUIWebAppSettingsURL[]; extern const char kChromeUIWebAppSettingsHost[]; #endif -@@ -446,14 +446,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; +@@ -451,14 +451,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -46,7 +46,7 @@ extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIEnterpriseProfileWelcomeHost[]; -@@ -467,7 +467,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -472,7 +472,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif diff --git a/www/iridium/files/patch-chrome_renderer_chrome__render__frame__observer.cc b/www/iridium/files/patch-chrome_renderer_chrome__render__frame__observer.cc index bc0e35c9aeaa..2ec2736d57b3 100644 --- a/www/iridium/files/patch-chrome_renderer_chrome__render__frame__observer.cc +++ b/www/iridium/files/patch-chrome_renderer_chrome__render__frame__observer.cc @@ -1,6 +1,6 @@ ---- chrome/renderer/chrome_render_frame_observer.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/renderer/chrome_render_frame_observer.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/renderer/chrome_render_frame_observer.cc -@@ -344,7 +344,7 @@ void ChromeRenderFrameObserver::OnDestruct() { +@@ -345,7 +345,7 @@ void ChromeRenderFrameObserver::OnDestruct() { void ChromeRenderFrameObserver::DraggableRegionsChanged() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 627c7f8b3789..a3df854ff799 100644 --- a/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc +++ b/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc @@ -1,6 +1,6 @@ ---- chrome/services/printing/print_backend_service_impl.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/services/printing/print_backend_service_impl.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/services/printing/print_backend_service_impl.cc -@@ -41,7 +41,7 @@ +@@ -43,7 +43,7 @@ #include "printing/backend/cups_connection_pool.h" #endif @@ -9,7 +9,7 @@ #include "base/no_destructor.h" #include "ui/linux/linux_ui.h" #include "ui/linux/linux_ui_delegate_stub.h" -@@ -68,7 +68,7 @@ namespace printing { +@@ -70,7 +70,7 @@ namespace printing { namespace { @@ -18,7 +18,7 @@ void InstantiateLinuxUiDelegate() { // TODO(crbug.com/809738) Until a real UI can be used in a utility process, // need to use the stub version. -@@ -437,7 +437,7 @@ void PrintBackendServiceImpl::Init(const std::string& +@@ -490,7 +490,7 @@ void PrintBackendServiceImpl::Init( // `InitCommon()`. InitializeProcessForPrinting(); print_backend_ = PrintBackend::CreateInstance(locale); @@ -27,12 +27,12 @@ // 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`. -@@ -620,7 +620,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( +@@ -677,7 +677,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>( print_backend_->GetPrinterDriverInfo(*printer_name)); --#if BUILDFLAG(IS_LINUX) && defined(USE_CUPS) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_CUPS) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_CUPS) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_CUPS) // Try to fill in advanced settings based upon basic info options. PrinterBasicInfo basic_info; if (print_backend_->GetPrinterBasicInfo(*printer_name, &basic_info) == diff --git a/www/iridium/files/patch-chrome_test_BUILD.gn b/www/iridium/files/patch-chrome_test_BUILD.gn index cdbcdcd89061..259a92c60ac0 100644 --- a/www/iridium/files/patch-chrome_test_BUILD.gn +++ b/www/iridium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2023-01-17 19:19:00 UTC +--- chrome/test/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ chrome/test/BUILD.gn -@@ -10141,7 +10141,7 @@ test("chrome_app_unittests") { +@@ -10043,7 +10043,7 @@ test("chrome_app_unittests") { "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", ] diff --git a/www/iridium/files/patch-chrome_test_chromedriver_chrome__launcher.cc b/www/iridium/files/patch-chrome_test_chromedriver_chrome__launcher.cc index 1d0dd8655cc1..5a5efe8f25cf 100644 --- a/www/iridium/files/patch-chrome_test_chromedriver_chrome__launcher.cc +++ b/www/iridium/files/patch-chrome_test_chromedriver_chrome__launcher.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/chrome_launcher.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/test/chromedriver/chrome_launcher.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/test/chromedriver/chrome_launcher.cc -@@ -65,6 +65,7 @@ +@@ -64,6 +64,7 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> diff --git a/www/iridium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc b/www/iridium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc index bc6367e9e9fb..8773e017749e 100644 --- a/www/iridium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc +++ b/www/iridium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/test/chromedriver/chrome/chrome_finder.cc -@@ -53,7 +53,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l +@@ -57,7 +57,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l installation_locations[i].Append(L"Chromium\\Application")); } } @@ -9,7 +9,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* locations) { // TODO: Respect users' PATH variables. // Until then, we use an approximation of the most common defaults. -@@ -138,7 +138,7 @@ bool FindChrome(base::FilePath* browser_exe) { +@@ -142,7 +142,7 @@ bool FindChrome(base::FilePath* browser_exe) { base::FilePath browser_exes_array[] = { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) base::FilePath(chrome::kBrowserProcessExecutablePath), diff --git a/www/iridium/files/patch-chrome_test_interaction_interaction__test__util__browser.cc b/www/iridium/files/patch-chrome_test_interaction_interaction__test__util__browser.cc index 81cbd9500986..5e8d07f4789b 100644 --- a/www/iridium/files/patch-chrome_test_interaction_interaction__test__util__browser.cc +++ b/www/iridium/files/patch-chrome_test_interaction_interaction__test__util__browser.cc @@ -1,11 +1,11 @@ ---- chrome/test/interaction/interaction_test_util_browser.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/test/interaction/interaction_test_util_browser.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/test/interaction/interaction_test_util_browser.cc -@@ -26,7 +26,7 @@ +@@ -35,7 +35,7 @@ #include "ui/base/interaction/interaction_test_util_mac.h" #endif -#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) #define SUPPORTS_PIXEL_TESTS 1 + #include "base/command_line.h" #include "chrome/browser/ui/test/test_browser_ui.h" - #else diff --git a/www/iridium/files/patch-chrome_updater_app_app__install.cc b/www/iridium/files/patch-chrome_updater_app_app__install.cc deleted file mode 100644 index 18c7c367e6ef..000000000000 --- a/www/iridium/files/patch-chrome_updater_app_app__install.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/updater/app/app_install.cc.orig 2023-01-17 19:19:00 UTC -+++ chrome/updater/app/app_install.cc -@@ -214,7 +214,7 @@ void AppInstall::WakeCandidate() { - update_service_internal, base::WrapRefCounted(this))); - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/1276114) - implement. - void AppInstall::WakeCandidateDone() { - NOTIMPLEMENTED(); diff --git a/www/iridium/files/patch-chrome_updater_app_app__uninstall.cc b/www/iridium/files/patch-chrome_updater_app_app__uninstall.cc deleted file mode 100644 index 24772418b209..000000000000 --- a/www/iridium/files/patch-chrome_updater_app_app__uninstall.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/updater/app/app_uninstall.cc.orig 2022-03-28 18:11:04 UTC -+++ chrome/updater/app/app_uninstall.cc -@@ -32,7 +32,7 @@ - #include "chrome/updater/win/setup/uninstall.h" - #elif BUILDFLAG(IS_MAC) - #include "chrome/updater/mac/setup/setup.h" --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "chrome/updater/linux/setup/setup.h" - #endif - diff --git a/www/iridium/files/patch-chrome_updater_configurator.cc b/www/iridium/files/patch-chrome_updater_configurator.cc new file mode 100644 index 000000000000..03311ec13ac9 --- /dev/null +++ b/www/iridium/files/patch-chrome_updater_configurator.cc @@ -0,0 +1,11 @@ +--- chrome/updater/configurator.cc.orig 2023-03-13 07:33:08 UTC ++++ chrome/updater/configurator.cc +@@ -57,7 +57,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs> + base::MakeRefCounted<update_client::InProcessUnzipperFactory>()), + patch_factory_( + base::MakeRefCounted<update_client::InProcessPatcherFactory>()) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On Linux creating the NetworkFetcherFactory requires performing blocking IO + // to load an external library. This should be done when the configurator is + // created. diff --git a/www/iridium/files/patch-chrome_updater_installer.cc b/www/iridium/files/patch-chrome_updater_installer.cc deleted file mode 100644 index 73801d0f9382..000000000000 --- a/www/iridium/files/patch-chrome_updater_installer.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/updater/installer.cc.orig 2023-01-17 19:19:00 UTC -+++ chrome/updater/installer.cc -@@ -252,7 +252,7 @@ absl::optional<base::FilePath> Installer::GetCurrentIn - return path->AppendASCII(pv_.GetString()); - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - - AppInstallerResult RunApplicationInstaller( - const AppInfo& /*app_info*/, diff --git a/www/iridium/files/patch-chrome_updater_updater.cc b/www/iridium/files/patch-chrome_updater_updater.cc deleted file mode 100644 index c2719ba07694..000000000000 --- a/www/iridium/files/patch-chrome_updater_updater.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/updater/updater.cc.orig 2023-01-17 19:19:00 UTC -+++ chrome/updater/updater.cc -@@ -44,7 +44,7 @@ - #include "chrome/updater/win/win_util.h" - #elif BUILDFLAG(IS_MAC) - #include "chrome/updater/app/server/mac/server.h" --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "chrome/updater/app/server/linux/server.h" - #include "chrome/updater/linux/ipc_support.h" - #endif -@@ -137,7 +137,7 @@ int HandleUpdaterCommands(UpdaterScope updater_scope, - CHECK(false) << "--crash-me was used."; - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // As long as this object is alive, all Mojo API surface relevant to IPC - // connections is usable, and message pipes which span a process boundary will - // continue to function. diff --git a/www/iridium/files/patch-chrome_updater_util.cc b/www/iridium/files/patch-chrome_updater_util.cc deleted file mode 100644 index 3d971bccbeb7..000000000000 --- a/www/iridium/files/patch-chrome_updater_util.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/updater/util.cc.orig 2023-01-17 19:19:00 UTC -+++ chrome/updater/util.cc -@@ -36,7 +36,7 @@ - #include "third_party/abseil-cpp/absl/types/optional.h" - #include "url/gurl.h" - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "chrome/updater/linux/linux_util.h" - #elif BUILDFLAG(IS_MAC) - #import "chrome/updater/mac/mac_util.h" -@@ -119,7 +119,7 @@ absl::optional<base::FilePath> GetBaseDataDirectory(Up - app_data_dir = GetApplicationDataDirectory(scope); - #elif BUILDFLAG(IS_MAC) - app_data_dir = GetApplicationSupportDirectory(scope); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - app_data_dir = GetApplicationDataDirectory(scope); - #endif - if (!app_data_dir) { diff --git a/www/iridium/files/patch-chrome_updater_util_posix__util.cc b/www/iridium/files/patch-chrome_updater_util_posix__util.cc new file mode 100644 index 000000000000..7dbf3dc3ef4a --- /dev/null +++ b/www/iridium/files/patch-chrome_updater_util_posix__util.cc @@ -0,0 +1,11 @@ +--- chrome/updater/util/posix_util.cc.orig 2023-03-13 07:33:08 UTC ++++ chrome/updater/util/posix_util.cc +@@ -10,7 +10,7 @@ + #include "chrome/updater/updater_branding.h" + #include "chrome/updater/util/util.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/updater/util/linux_util.h" + #endif + diff --git a/www/iridium/files/patch-chrome_utility_services.cc b/www/iridium/files/patch-chrome_utility_services.cc index 7c043db502e6..364e316f1747 100644 --- a/www/iridium/files/patch-chrome_utility_services.cc +++ b/www/iridium/files/patch-chrome_utility_services.cc @@ -1,4 +1,4 @@ ---- chrome/utility/services.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/utility/services.cc.orig 2023-03-13 07:33:08 UTC +++ chrome/utility/services.cc @@ -56,7 +56,7 @@ #include "chrome/services/system_signals/mac/mac_system_signals_service.h" @@ -27,7 +27,7 @@ auto RunSystemSignalsService( mojo::PendingReceiver<device_signals::mojom::SystemSignalsService> receiver) { -@@ -287,7 +287,7 @@ auto RunCupsIppParser( +@@ -285,7 +285,7 @@ auto RunCupsIppParser( } #endif @@ -36,7 +36,7 @@ auto RunDocumentAnalysis( mojo::PendingReceiver<chrome::mojom::DocumentAnalysisService> receiver) { return std::make_unique<DocumentAnalysisService>(std::move(receiver)); -@@ -471,7 +471,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -465,7 +465,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunWindowsIconReader); #endif // BUILDFLAG(IS_WIN) @@ -45,7 +45,7 @@ services.Add(RunSystemSignalsService); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -487,7 +487,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -481,7 +481,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunFileUtil); #endif diff --git a/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc index cd0b2c04d87b..d6861ad26a25 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 2022-10-05 07:34:01 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2023-03-13 07:33:08 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -90,7 +90,7 @@ +@@ -89,7 +89,7 @@ #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_switches.h" @@ -9,7 +9,7 @@ #include <fontconfig/fontconfig.h> #include <signal.h> #include <sys/prctl.h> -@@ -265,7 +265,7 @@ class CastViewsDelegate : public views::ViewsDelegate +@@ -262,7 +262,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()); -@@ -311,7 +311,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -308,7 +308,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {cc::switches::kDisableThreadedAnimation, ""}, #endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) @@ -27,7 +27,7 @@ #if defined(ARCH_CPU_X86_FAMILY) // This is needed for now to enable the x11 Ozone platform to work with // current Linux/NVidia OpenGL drivers. -@@ -482,7 +482,7 @@ void CastBrowserMainParts::ToolkitInitialized() { +@@ -479,7 +479,7 @@ void CastBrowserMainParts::ToolkitInitialized() { views_delegate_ = std::make_unique<CastViewsDelegate>(); #endif // defined(USE_AURA) diff --git a/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc index 38803341637b..f0cc4c4795cd 100644 --- a/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2023-01-17 19:19:00 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2023-03-13 07:33:08 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -433,7 +433,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -427,7 +427,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { diff --git a/www/iridium/files/patch-components_autofill__assistant_browser_client__context.cc b/www/iridium/files/patch-components_autofill__assistant_browser_client__context.cc deleted file mode 100644 index 8a90c0e649e9..000000000000 --- a/www/iridium/files/patch-components_autofill__assistant_browser_client__context.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/autofill_assistant/browser/client_context.cc.orig 2023-01-17 19:19:00 UTC -+++ components/autofill_assistant/browser/client_context.cc -@@ -109,7 +109,7 @@ ClientContextProto::PlatformType ClientContext::GetPla - #if BUILDFLAG(IS_ANDROID) - return ClientContextProto::PLATFORM_TYPE_ANDROID; - #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - return ClientContextProto::PLATFORM_TYPE_DESKTOP; - #else - return ClientContextProto::PLATFORM_TYPE_UNDEFINED; diff --git a/www/iridium/files/patch-components_autofill__assistant_browser_client__context__unittest.cc b/www/iridium/files/patch-components_autofill__assistant_browser_client__context__unittest.cc deleted file mode 100644 index 6a1b5ff48a7f..000000000000 --- a/www/iridium/files/patch-components_autofill__assistant_browser_client__context__unittest.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- components/autofill_assistant/browser/client_context_unittest.cc.orig 2023-01-17 19:19:00 UTC -+++ components/autofill_assistant/browser/client_context_unittest.cc -@@ -75,7 +75,7 @@ TEST_F(ClientContextTest, Initialize) { - ClientContextProto::PLATFORM_TYPE_ANDROID); - #endif - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - EXPECT_THAT(actual_client_context.platform_type(), - ClientContextProto::PLATFORM_TYPE_DESKTOP); - #endif -@@ -256,7 +256,7 @@ TEST(GetPlatformType, ReturnsCorrectPlatform) { - ClientContextProto::PLATFORM_TYPE_ANDROID); - #endif - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - EXPECT_THAT(ClientContext::GetPlatformType(), - ClientContextProto::PLATFORM_TYPE_DESKTOP); - #endif diff --git a/www/iridium/files/patch-components_autofill__payments__strings.grdp b/www/iridium/files/patch-components_autofill__payments__strings.grdp index f49b8fe5f927..36306e22d17c 100644 --- a/www/iridium/files/patch-components_autofill__payments__strings.grdp +++ b/www/iridium/files/patch-components_autofill__payments__strings.grdp @@ -1,6 +1,6 @@ ---- components/autofill_payments_strings.grdp.orig 2023-01-17 19:19:00 UTC +--- components/autofill_payments_strings.grdp.orig 2023-03-13 07:33:08 UTC +++ components/autofill_payments_strings.grdp -@@ -112,7 +112,7 @@ +@@ -118,7 +118,7 @@ <message name="IDS_AUTOFILL_FIX_FLOW_PROMPT_SAVE_CARD_LABEL" desc="Text to show on the button to save the card to Google when the fix flow dialog is shown after the Autofill save card prompt." formatter_data="android_java"> Save card </message> diff --git a/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc index 5f2707a9e77e..7f07a10fb0dc 100644 --- a/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc +++ b/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/personal_data_manager.cc.orig 2023-01-17 19:19:00 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2023-03-13 07:33:08 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -2079,7 +2079,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2233,7 +2233,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/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 9c7d425280c1..a31d1857d216 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,6 +1,6 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2022-12-06 08:09:13 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2023-03-13 07:33:08 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -267,7 +267,7 @@ const base::FeatureParam<int> +@@ -266,7 +266,7 @@ const base::FeatureParam<int> bool ShouldShowImprovedUserConsentForCreditCardSave() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-components_components__chromium__strings.grd b/www/iridium/files/patch-components_components__chromium__strings.grd index 2e86a665c966..16c009939515 100644 --- a/www/iridium/files/patch-components_components__chromium__strings.grd +++ b/www/iridium/files/patch-components_components__chromium__strings.grd @@ -1,6 +1,6 @@ ---- components/components_chromium_strings.grd.orig 2022-10-05 07:34:01 UTC +--- components/components_chromium_strings.grd.orig 2023-03-13 07:33:08 UTC +++ components/components_chromium_strings.grd -@@ -223,7 +223,7 @@ +@@ -220,7 +220,7 @@ </message> </if> <!-- The ChromeOS version of this string is defined in //components/error_page_strings.grdp. --> diff --git a/www/iridium/files/patch-components_components__google__chrome__strings.grd b/www/iridium/files/patch-components_components__google__chrome__strings.grd index 39422a4de4d4..1d25510f6b66 100644 --- a/www/iridium/files/patch-components_components__google__chrome__strings.grd +++ b/www/iridium/files/patch-components_components__google__chrome__strings.grd @@ -1,6 +1,6 @@ ---- components/components_google_chrome_strings.grd.orig 2022-10-05 07:34:01 UTC +--- components/components_google_chrome_strings.grd.orig 2023-03-13 07:33:08 UTC +++ components/components_google_chrome_strings.grd -@@ -230,7 +230,7 @@ +@@ -220,7 +220,7 @@ </message> </if> <!-- The ChromeOS version of this string is defined in //components/error_page_strings.grdp. --> diff --git a/www/iridium/files/patch-components_embedder__support_user__agent__utils__unittest.cc b/www/iridium/files/patch-components_embedder__support_user__agent__utils__unittest.cc index ef5cc3c727bf..c558f2dbf63e 100644 --- a/www/iridium/files/patch-components_embedder__support_user__agent__utils__unittest.cc +++ b/www/iridium/files/patch-components_embedder__support_user__agent__utils__unittest.cc @@ -1,6 +1,6 @@ ---- components/embedder_support/user_agent_utils_unittest.cc.orig 2022-10-05 07:34:01 UTC +--- components/embedder_support/user_agent_utils_unittest.cc.orig 2023-03-13 07:33:08 UTC +++ components/embedder_support/user_agent_utils_unittest.cc -@@ -80,7 +80,7 @@ const char kDesktop[] = +@@ -81,7 +81,7 @@ const char kDesktop[] = "Safari/537.36"; #endif // BUILDFLAG(IS_ANDROID) @@ -9,7 +9,7 @@ std::string GetMachine() { struct utsname unixinfo; uname(&unixinfo); -@@ -188,7 +188,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) +@@ -189,7 +189,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) int value; ASSERT_TRUE(base::StringToInt(pieces[i], &value)); } 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 6c2867f76609..0cde74ab5c21 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 2023-01-17 19:19:00 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2023-03-13 07:33:08 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -35,7 +35,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe absl::optional<FeatureConfig> GetClientSideFeatureConfig( @@ -9,7 +9,7 @@ if (kIPHPasswordsAccountStorageFeature.name == feature->name) { absl::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -1029,7 +1029,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf +@@ -1066,7 +1066,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf #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 b0ea055415a1..36ca4b0ac1f0 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 2023-01-17 19:19:00 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2023-03-13 07:33:08 UTC +++ components/feature_engagement/public/feature_constants.cc -@@ -24,7 +24,7 @@ BASE_FEATURE(kUseClientConfigIPH, +@@ -19,7 +19,7 @@ BASE_FEATURE(kUseClientConfigIPH, BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ BASE_FEATURE(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -424,7 +424,8 @@ BASE_FEATURE(kIPHOverflowMenuTipFeature, +@@ -434,7 +434,8 @@ BASE_FEATURE(kIPHiOSDefaultBrowserSettingsBadgeFeature #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ 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 6dac1e272c3b..52b5abffe935 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,7 +1,7 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2023-01-17 19:19:00 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2023-03-13 07:33:08 UTC +++ components/feature_engagement/public/feature_constants.h -@@ -32,7 +32,7 @@ BASE_DECLARE_FEATURE(kIPHDummyFeature); - BASE_DECLARE_FEATURE(kEnableIPH); +@@ -22,7 +22,7 @@ BASE_DECLARE_FEATURE(kUseClientConfigIPH); + BASE_DECLARE_FEATURE(kIPHDummyFeature); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -9,7 +9,7 @@ BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature); BASE_DECLARE_FEATURE(kIPHDesktopSharedHighlightingFeature); BASE_DECLARE_FEATURE(kIPHDesktopTabGroupsNewGroupFeature); -@@ -185,7 +185,8 @@ BASE_DECLARE_FEATURE(kIPHOverflowMenuTipFeature); +@@ -180,7 +180,8 @@ BASE_DECLARE_FEATURE(kIPHiOSDefaultBrowserSettingsBadg #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || 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 aabb1fc931c4..62cafbef9853 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 2023-01-17 19:19:00 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2023-03-13 07:33:08 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -122,7 +122,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHOverflowMenuTipFeature, +@@ -127,7 +127,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHiOSDefaultBrowserSettingsBadgeFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -9,7 +9,7 @@ &kIPHBatterySaverModeFeature, &kIPHDesktopTabGroupsNewGroupFeature, &kIPHExtensionsMenuFeature, -@@ -154,7 +154,8 @@ const base::Feature* const kAllFeatures[] = { +@@ -159,7 +159,8 @@ const base::Feature* const kAllFeatures[] = { // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || 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 a2490b5f3033..268df830aa7e 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 2023-01-17 19:19:00 UTC +--- components/feature_engagement/public/feature_list.h.orig 2023-03-13 07:33:08 UTC +++ components/feature_engagement/public/feature_list.h -@@ -222,7 +222,7 @@ DEFINE_VARIATION_PARAM(kIPHOverflowMenuTipFeature, "IP +@@ -232,7 +232,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSDefaultBrowserSettingsBa #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode"); DEFINE_VARIATION_PARAM(kIPHDesktopTabGroupsNewGroupFeature, "IPH_DesktopTabGroupsNewGroup"); -@@ -268,7 +268,8 @@ DEFINE_VARIATION_PARAM(kIPHPriceTrackingInSidePanelFea +@@ -278,7 +278,8 @@ DEFINE_VARIATION_PARAM(kIPHPriceTrackingInSidePanelFea // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,16 +19,16 @@ DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardSuggestionFeature, "IPH_AutofillVirtualCardSuggestion"); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || -@@ -375,7 +376,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHFollowWhileBrowsingFeature), - VARIATION_ENTRY(kIPHOverflowMenuTipFeature), +@@ -396,7 +397,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHiOSDefaultBrowserOverflowMenuBadgeFeature), + VARIATION_ENTRY(kIPHiOSDefaultBrowserSettingsBadgeFeature), #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(kIPHDesktopTabGroupsNewGroupFeature), VARIATION_ENTRY(kIPHExtensionsMenuFeature), -@@ -408,7 +409,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -429,7 +430,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-components_feed_core_v2_proto__util.cc b/www/iridium/files/patch-components_feed_core_v2_proto__util.cc index aa6e35c5dc4d..0c47d46017d5 100644 --- a/www/iridium/files/patch-components_feed_core_v2_proto__util.cc +++ b/www/iridium/files/patch-components_feed_core_v2_proto__util.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/proto_util.cc.orig 2022-10-05 07:34:01 UTC +--- components/feed/core/v2/proto_util.cc.orig 2023-03-13 07:33:08 UTC +++ components/feed/core/v2/proto_util.cc -@@ -90,8 +90,8 @@ feedwire::Version GetPlatformVersionMessage() { +@@ -92,8 +92,8 @@ feedwire::Version GetPlatformVersionMessage() { int32_t major, minor, revision; base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &revision); @@ -11,7 +11,7 @@ result.set_revision(revision); #if BUILDFLAG(IS_ANDROID) result.set_api_version(base::android::BuildInfo::GetInstance()->sdk_int()); -@@ -106,8 +106,8 @@ feedwire::Version GetAppVersionMessage(const ChromeInf +@@ -108,8 +108,8 @@ feedwire::Version GetAppVersionMessage(const ChromeInf // Chrome's version is in the format: MAJOR,MINOR,BUILD,PATCH. const std::vector<uint32_t>& numbers = chrome_info.version.components(); if (numbers.size() > 3) { diff --git a/www/iridium/files/patch-components_named__mojo__ipc__server_connection__info.h b/www/iridium/files/patch-components_named__mojo__ipc__server_connection__info.h new file mode 100644 index 000000000000..7f19bfdb45bd --- /dev/null +++ b/www/iridium/files/patch-components_named__mojo__ipc__server_connection__info.h @@ -0,0 +1,20 @@ +--- components/named_mojo_ipc_server/connection_info.h.orig 2023-03-13 07:33:08 UTC ++++ components/named_mojo_ipc_server/connection_info.h +@@ -13,7 +13,7 @@ + #include "base/win/scoped_handle.h" + #elif BUILDFLAG(IS_MAC) + #include <bsm/libbsm.h> +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include <sys/socket.h> + #endif + +@@ -32,7 +32,7 @@ struct ConnectionInfo { + absl::optional<base::win::ScopedHandle> impersonation_token{}; + #elif BUILDFLAG(IS_MAC) + audit_token_t audit_token{}; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ucred credentials{}; + #endif + }; diff --git a/www/iridium/files/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc b/www/iridium/files/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc new file mode 100644 index 000000000000..d22c523f98f1 --- /dev/null +++ b/www/iridium/files/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc @@ -0,0 +1,11 @@ +--- components/named_mojo_ipc_server/named_mojo_ipc_server_client_util.cc.orig 2023-03-13 07:33:08 UTC ++++ components/named_mojo_ipc_server/named_mojo_ipc_server_client_util.cc +@@ -22,7 +22,7 @@ namespace named_mojo_ipc_server { + // static + mojo::PlatformChannelEndpoint ConnectToServer( + const mojo::NamedPlatformChannel::ServerName& server_name) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + return mojo::NamedPlatformChannel::ConnectToServer(server_name); + #elif BUILDFLAG(IS_MAC) + mojo::PlatformChannelEndpoint endpoint = diff --git a/www/iridium/files/patch-components_neterror_resources_neterror.js b/www/iridium/files/patch-components_neterror_resources_neterror.js index 9bd7a1f3d07a..2631295ade7e 100644 --- a/www/iridium/files/patch-components_neterror_resources_neterror.js +++ b/www/iridium/files/patch-components_neterror_resources_neterror.js @@ -1,6 +1,6 @@ ---- components/neterror/resources/neterror.js.orig 2022-10-05 07:34:01 UTC +--- components/neterror/resources/neterror.js.orig 2023-03-13 07:33:08 UTC +++ components/neterror/resources/neterror.js -@@ -130,7 +130,7 @@ function detailsButtonClick() { +@@ -137,7 +137,7 @@ function detailsButtonClick() { let primaryControlOnLeft = true; // clang-format off diff --git a/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client.cc b/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client.cc index b986a7db1455..7190f8844fa4 100644 --- a/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client.cc +++ b/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client.cc @@ -1,6 +1,6 @@ ---- components/paint_preview/browser/paint_preview_client.cc.orig 2022-12-01 10:35:46 UTC +--- components/paint_preview/browser/paint_preview_client.cc.orig 2023-03-13 07:33:08 UTC +++ components/paint_preview/browser/paint_preview_client.cc -@@ -307,8 +307,8 @@ void PaintPreviewClient::CapturePaintPreview( +@@ -310,8 +310,8 @@ void PaintPreviewClient::CapturePaintPreview( metadata->set_url(url.spec()); metadata->set_version(kPaintPreviewVersion); auto* chromeVersion = metadata->mutable_chrome_version(); 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 5d35cf88a3a0..bda61a904c18 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 2022-10-05 07:34:01 UTC +--- components/paint_preview/player/player_compositor_delegate.cc.orig 2023-03-13 07:33:08 UTC +++ components/paint_preview/player/player_compositor_delegate.cc -@@ -444,8 +444,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT +@@ -452,8 +452,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT // use the AXTreeUpdate. auto chrome_version = capture_result_->proto.metadata().chrome_version(); if (capture_result_->proto.metadata().has_chrome_version() && diff --git a/www/iridium/files/patch-components_password__manager_core_browser_login__database.cc b/www/iridium/files/patch-components_password__manager_core_browser_login__database.cc index 272eaf439f1a..4ecfd65ca443 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_login__database.cc +++ b/www/iridium/files/patch-components_password__manager_core_browser_login__database.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/login_database.cc.orig 2022-12-06 08:09:13 UTC +--- components/password_manager/core/browser/login_database.cc.orig 2023-03-13 07:33:08 UTC +++ components/password_manager/core/browser/login_database.cc -@@ -732,7 +732,7 @@ std::string GeneratePlaceholders(size_t count) { +@@ -728,7 +728,7 @@ std::string GeneratePlaceholders(size_t count) { return result; } @@ -9,7 +9,7 @@ // Fills |form| with necessary data required to be removed from the database // and returns it. PasswordForm GetFormForRemoval(sql::Statement& statement) { -@@ -749,7 +749,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme +@@ -745,7 +745,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme // Whether we should try to return the decryptable passwords while the // encryption service fails for some passwords. bool ShouldReturnPartialPasswords() { @@ -18,7 +18,7 @@ return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords); #else return false; -@@ -1578,7 +1578,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { +@@ -1559,7 +1559,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { } DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() { diff --git a/www/iridium/files/patch-components_password__manager_core_browser_login__database__unittest.cc b/www/iridium/files/patch-components_password__manager_core_browser_login__database__unittest.cc index ab5bc06ff45f..c24a059915a9 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_login__database__unittest.cc +++ b/www/iridium/files/patch-components_password__manager_core_browser_login__database__unittest.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/login_database_unittest.cc.orig 2023-01-17 19:19:00 UTC +--- components/password_manager/core/browser/login_database_unittest.cc.orig 2023-03-13 07:33:08 UTC +++ components/password_manager/core/browser/login_database_unittest.cc -@@ -2092,7 +2092,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd +@@ -2108,7 +2108,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd base::HistogramTester histogram_tester; ASSERT_TRUE(db.Init()); @@ -9,7 +9,7 @@ // Make sure that we can't get any logins when database is corrupted. // Disabling the checks in chromecast because encryption is unavailable. std::vector<std::unique_ptr<PasswordForm>> result; -@@ -2118,7 +2118,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd +@@ -2135,7 +2135,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd #endif // Check histograms. @@ -18,7 +18,7 @@ histogram_tester.ExpectUniqueSample( "PasswordManager.DeleteUndecryptableLoginsReturnValue", metrics_util::DeleteCorruptedPasswordsResult::kSuccessPasswordsDeleted, -@@ -2161,7 +2161,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL +@@ -2178,7 +2178,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL } #endif // BUILDFLAG(IS_MAC) @@ -26,4 +26,4 @@ +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Test getting auto sign in logins when there are undecryptable ones TEST_F(LoginDatabaseUndecryptableLoginsTest, GetAutoSignInLogins) { - PrimaryKeyToFormMap key_to_form_map; + std::vector<std::unique_ptr<PasswordForm>> forms; diff --git a/www/iridium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc b/www/iridium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc index 6168df1493bd..f2fb7fdace7d 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc +++ b/www/iridium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc @@ -1,9 +1,9 @@ ---- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2023-01-17 19:19:00 UTC +--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2023-03-13 07:33:08 UTC +++ components/password_manager/core/browser/sync/password_sync_bridge.cc @@ -185,7 +185,7 @@ bool IsCredentialPhished(const sync_pb::PasswordSpecif // merge. bool ShouldRecoverPasswordsDuringMerge() { - // Delete the local undecryptable copy when this is MacOS only. + // Delete the local undecryptable copy when this is MacOS or Linux only. -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return true; @@ -13,8 +13,8 @@ } bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() { --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return ShouldRecoverPasswordsDuringMerge() && base::FeatureList::IsEnabled( features::kForceInitialSyncWhenDecryptionFails); diff --git a/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.cc b/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.cc index 9aaa20c9329d..8024e71341b2 100644 --- a/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.cc +++ b/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.cc @@ -1,15 +1,15 @@ ---- components/password_manager/core/common/password_manager_features.cc.orig 2023-01-17 19:19:00 UTC +--- components/password_manager/core/common/password_manager_features.cc.orig 2023-03-13 07:33:08 UTC +++ components/password_manager/core/common/password_manager_features.cc -@@ -86,7 +86,7 @@ BASE_FEATURE(kFillOnAccountSelect, +@@ -69,7 +69,7 @@ BASE_FEATURE(kFillOnAccountSelect, "fill-on-account-select", base::FEATURE_DISABLED_BY_DEFAULT); --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // When enabled, initial sync will be forced during startup if the password // store has encryption service failures. BASE_FEATURE(kForceInitialSyncWhenDecryptionFails, -@@ -235,7 +235,7 @@ BASE_FEATURE(kPasswordStrengthIndicator, +@@ -186,7 +186,7 @@ BASE_FEATURE(kPasswordStrengthIndicator, "PasswordStrengthIndicator", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.h b/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.h index 97576f6dc734..3ff56b0f42b5 100644 --- a/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.h +++ b/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.h @@ -1,15 +1,15 @@ ---- components/password_manager/core/common/password_manager_features.h.orig 2023-01-17 19:19:00 UTC +--- components/password_manager/core/common/password_manager_features.h.orig 2023-03-13 07:33:08 UTC +++ components/password_manager/core/common/password_manager_features.h -@@ -37,7 +37,7 @@ BASE_DECLARE_FEATURE(kEnablePasswordGenerationForClear +@@ -35,7 +35,7 @@ BASE_DECLARE_FEATURE(kEnablePasswordGenerationForClear BASE_DECLARE_FEATURE(kEnablePasswordManagerWithinFencedFrame); BASE_DECLARE_FEATURE(kFillingAcrossAffiliatedWebsites); BASE_DECLARE_FEATURE(kFillOnAccountSelect); --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kForceInitialSyncWhenDecryptionFails); #endif BASE_DECLARE_FEATURE(kInferConfirmationPasswordField); -@@ -68,7 +68,7 @@ BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid); +@@ -62,7 +62,7 @@ BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid); #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) // Desktop BASE_DECLARE_FEATURE(kRevampedPasswordManagementBubble); #endif 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 5681314256ba..bf778d30d462 100644 --- a/www/iridium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc +++ b/www/iridium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc @@ -1,6 +1,6 @@ ---- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2022-12-06 08:09:13 UTC +--- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2023-03-13 07:33:08 UTC +++ components/policy/core/browser/policy_pref_mapping_test.cc -@@ -337,7 +337,7 @@ class PolicyTestCase { +@@ -326,7 +326,7 @@ class PolicyTestCase { const std::string os("chromeos_lacros"); #elif BUILDFLAG(IS_IOS) const std::string os("ios"); diff --git a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc index 30dd43ef70ba..7529b3abae00 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 2022-12-06 08:09:13 UTC +--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2023-03-13 07:33:08 UTC +++ components/policy/core/common/cloud/cloud_policy_client.cc -@@ -448,7 +448,7 @@ void CloudPolicyClient::FetchPolicy() { +@@ -424,7 +424,7 @@ void CloudPolicyClient::FetchPolicy() { fetch_request->set_invalidation_payload(invalidation_payload_); } } 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 2afbc8d32c19..7c636f8ba1ef 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 2022-12-06 08:09:13 UTC +--- components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc.orig 2023-03-13 07:33:08 UTC +++ components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc -@@ -200,7 +200,7 @@ void CrossDeviceUserSegment::ExecuteModelWithInput( +@@ -175,7 +175,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_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc b/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc index a138988eb930..dd10dc2986fa 100644 --- a/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc +++ b/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc @@ -1,6 +1,6 @@ ---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2022-03-28 18:11:04 UTC +--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2023-03-13 07:33:08 UTC +++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc -@@ -19,7 +19,7 @@ +@@ -20,7 +20,7 @@ #if BUILDFLAG(IS_WIN) #include "content/public/child/dwrite_font_proxy_init_win.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" #endif -@@ -64,7 +64,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp +@@ -65,7 +65,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp // Initialize font access for Skia. #if BUILDFLAG(IS_WIN) content::InitializeDWriteFontProxy(); @@ -18,7 +18,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; content::UtilityThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -87,7 +87,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp +@@ -88,7 +88,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp base::BindOnce([] { SkFontMgr::RefDefault(); })); // Sanity check that fonts are working. diff --git a/www/iridium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc b/www/iridium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc index 69547c7a0201..ac53921e546f 100644 --- a/www/iridium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc +++ b/www/iridium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2023-01-17 19:19:00 UTC +--- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2023-03-13 07:33:08 UTC +++ components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc @@ -34,6 +34,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi } @@ -8,7 +8,7 @@ auto* instance = sandbox::policy::SandboxLinux::GetInstance(); std::vector<BrokerFilePermission> permissions{ -@@ -52,6 +53,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi +@@ -57,6 +58,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi sandbox::syscall_broker::COMMAND_OPEN}), permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), options); instance->EngageNamespaceSandboxIfPossible(); 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 0f83e184f7a6..0c52f54693e9 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 2022-12-06 08:09:13 UTC +--- components/sync_device_info/local_device_info_util.cc.orig 2023-03-13 07:33:08 UTC +++ components/sync_device_info/local_device_info_util.cc -@@ -78,7 +78,7 @@ void OnMachineStatisticsLoaded(LocalDeviceNameInfo* na +@@ -82,7 +82,7 @@ void OnMachineStatisticsLoaded(LocalDeviceNameInfo* na sync_pb::SyncEnums::DeviceType GetLocalDeviceType() { #if BUILDFLAG(IS_CHROMEOS) return sync_pb::SyncEnums_DeviceType_TYPE_CROS; @@ -9,7 +9,7 @@ return sync_pb::SyncEnums_DeviceType_TYPE_LINUX; #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) return ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET -@@ -98,7 +98,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { +@@ -102,7 +102,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { return DeviceInfo::OsType::kChromeOsAsh; #elif BUILDFLAG(IS_CHROMEOS_LACROS) return DeviceInfo::OsType::kChromeOsLacros; @@ -18,7 +18,7 @@ return DeviceInfo::OsType::kLinux; #elif BUILDFLAG(IS_ANDROID) return DeviceInfo::OsType::kAndroid; -@@ -117,7 +117,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { +@@ -121,7 +121,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_url__formatter_spoof__checks_idn__spoof__checker.cc b/www/iridium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc index f8363ad54e13..154c08c79018 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 2022-03-28 18:11:04 UTC +--- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2023-03-13 07:33:08 UTC +++ components/url_formatter/spoof_checks/idn_spoof_checker.cc -@@ -285,7 +285,7 @@ IDNSpoofChecker::IDNSpoofChecker() { +@@ -286,7 +286,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_viz_host_host__display__client.cc b/www/iridium/files/patch-components_viz_host_host__display__client.cc index df70b6bbcaac..19aec000e0c0 100644 --- a/www/iridium/files/patch-components_viz_host_host__display__client.cc +++ b/www/iridium/files/patch-components_viz_host_host__display__client.cc @@ -1,6 +1,6 @@ ---- components/viz/host/host_display_client.cc.orig 2023-01-17 19:19:00 UTC +--- components/viz/host/host_display_client.cc.orig 2023-03-13 07:33:08 UTC +++ components/viz/host/host_display_client.cc -@@ -66,7 +66,7 @@ void HostDisplayClient::AddChildWindowToBrowser( +@@ -67,7 +67,7 @@ void HostDisplayClient::AddChildWindowToBrowser( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 4fff1930289a..86d1f8c18a40 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 2023-01-17 19:19:00 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2023-03-13 07:33:08 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1174,7 +1174,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1259,7 +1259,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetDeviceQueue() ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, ycbcr_info); @@ -9,12 +9,3 @@ // Textures that were allocated _on linux_ with ycbcr info came from // VaapiVideoDecoder, which exports using DRM format modifiers. return GrBackendFormat::MakeVk(gr_ycbcr_info, -@@ -1193,7 +1193,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor - return GrBackendFormat::MakeMtl(ToMTLPixelFormat(resource_format)); - #endif - } else { --#if !BUILDFLAG(IS_LINUX) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - // Skip the check as ycbcr info is always set by `VaapiVideoDecoder` on - // Linux. - DCHECK(!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 76111976c56a..69c087335a72 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,6 +1,6 @@ ---- components/viz/service/display_embedder/software_output_surface.cc.orig 2022-10-05 07:34:01 UTC +--- components/viz/service/display_embedder/software_output_surface.cc.orig 2023-03-13 07:33:08 UTC +++ components/viz/service/display_embedder/software_output_surface.cc -@@ -93,7 +93,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: +@@ -98,7 +98,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ if (needs_swap_size_notifications_) client_->DidSwapWithSize(pixel_size); #endif -@@ -120,7 +120,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla +@@ -125,7 +125,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 7235267a4025..7de4f478b17a 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 2022-12-06 08:09:13 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2023-03-13 07:33:08 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1129,7 +1129,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1149,7 +1149,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 6fa3dc90f1dc..329177070e4d 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,4 +1,4 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2022-12-06 08:09:13 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2023-03-13 07:33:08 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc @@ -98,7 +98,7 @@ RootCompositorFrameSinkImpl::Create( @@ -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); -@@ -577,7 +577,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -585,7 +585,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw display_client_->DidCompleteSwapWithSize(pixel_size); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h index ce7d621eb0f4..0d72ee84e2ff 100644 --- a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h +++ b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -1,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2023-01-17 19:19:00 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2023-03-13 07:33:08 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -197,7 +197,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl +@@ -200,7 +200,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-content_app_content__main.cc b/www/iridium/files/patch-content_app_content__main.cc index e5d736a2e181..84622b79eb7b 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 2022-12-01 10:35:46 UTC +--- content/app/content_main.cc.orig 2023-03-13 07:33:08 UTC +++ content/app/content_main.cc -@@ -226,7 +226,7 @@ RunContentProcess(ContentMainParams params, +@@ -205,7 +205,7 @@ RunContentProcess(ContentMainParams params, #endif base::EnableTerminationOnOutOfMemory(); 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 99bb9f3203b6..6b15311142fc 100644 --- a/www/iridium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/iridium/files/patch-content_app_content__main__runner__impl.cc @@ -1,6 +1,6 @@ ---- content/app/content_main_runner_impl.cc.orig 2023-01-17 19:19:00 UTC +--- content/app/content_main_runner_impl.cc.orig 2023-03-13 07:33:08 UTC +++ content/app/content_main_runner_impl.cc -@@ -135,13 +135,13 @@ +@@ -139,13 +139,13 @@ #include "content/browser/posix_file_descriptor_info_impl.h" #include "content/public/common/content_descriptors.h" @@ -13,10 +13,10 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "base/files/file_path_watcher_inotify.h" #include "base/native_library.h" #include "base/rand_util.h" - #include "content/public/common/zygote/sandbox_support_linux.h" -@@ -180,6 +180,10 @@ +@@ -186,6 +186,10 @@ #include "media/base/media_switches.h" #endif @@ -27,25 +27,35 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -361,7 +365,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -371,7 +375,7 @@ void InitializeZygoteSandboxForBrowserProcess( } - #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) + #endif // BUILDFLAG(USE_ZYGOTE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -397,7 +401,7 @@ void PreloadLibraryCdms() { +@@ -407,15 +411,17 @@ void PreloadLibraryCdms() { } #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS) --#if BUILDFLAG(USE_ZYGOTE_HANDLE) -+#if BUILDFLAG(USE_ZYGOTE_HANDLE) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(USE_ZYGOTE) ++#if BUILDFLAG(USE_ZYGOTE) || BUILDFLAG(IS_BSD) void PreSandboxInit() { // Pre-acquire resources needed by BoringSSL. See // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md -@@ -420,6 +424,11 @@ void PreSandboxInit() { + CRYPTO_pre_sandbox_init(); + ++#if !BUILDFLAG(IS_BSD) + // Pre-read /proc/sys/fs/inotify/max_user_watches so it doesn't have to be + // allowed by the sandbox. + base::GetMaxNumberOfInotifyWatches(); ++#endif + + #if BUILDFLAG(ENABLE_PPAPI) + // Ensure access to the Pepper plugins before the sandbox is turned on. +@@ -434,6 +440,11 @@ void PreSandboxInit() { } #endif @@ -57,7 +67,7 @@ // Set the android SkFontMgr for blink. We need to ensure this is done // before the sandbox is initialized to allow the font manager to access // font configuration files on disk. -@@ -602,7 +611,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* +@@ -621,7 +632,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -66,7 +76,7 @@ PreSandboxInit(); #endif -@@ -796,11 +805,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -823,11 +834,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -80,7 +90,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -982,6 +990,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1012,6 +1022,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam } #endif @@ -96,9 +106,9 @@ + delegate_->SandboxInitialized(process_type); - #if BUILDFLAG(USE_ZYGOTE_HANDLE) -@@ -1045,7 +1063,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { - process_type); + #if BUILDFLAG(USE_ZYGOTE) +@@ -1079,7 +1099,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { + ->ReconfigureAfterFeatureListInit(process_type); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -106,7 +116,7 @@ // If dynamic Mojo Core is being used, ensure that it's loaded very early in // the child/zygote process, before any sandbox is initialized. The library // is not fully initialized with IPC support until a ChildProcess is later -@@ -1078,6 +1096,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1112,6 +1132,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); diff --git a/www/iridium/files/patch-content_browser_BUILD.gn b/www/iridium/files/patch-content_browser_BUILD.gn index 79a6a368c982..26f5861c9fc7 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 2023-01-17 19:19:00 UTC +--- content/browser/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ content/browser/BUILD.gn -@@ -2338,6 +2338,13 @@ source_set("browser") { +@@ -2386,6 +2386,13 @@ source_set("browser") { ] } 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 8bd9a9b7ae5b..814e87862bcf 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 2022-12-06 08:09:13 UTC +--- content/browser/browser_main_loop.cc.orig 2023-03-13 07:33:08 UTC +++ content/browser/browser_main_loop.cc -@@ -242,6 +242,12 @@ +@@ -245,6 +245,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 -@@ -526,6 +532,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -538,6 +544,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 -@@ -557,7 +569,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -575,7 +587,7 @@ int BrowserMainLoop::EarlyInitialization() { base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc index 590ac969daef..13ab1acd8460 100644 --- a/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc +++ b/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc @@ -1,4 +1,4 @@ ---- content/browser/child_process_launcher_helper_linux.cc.orig 2022-10-05 07:34:01 UTC +--- content/browser/child_process_launcher_helper_linux.cc.orig 2023-03-13 07:33:08 UTC +++ content/browser/child_process_launcher_helper_linux.cc @@ -20,7 +20,9 @@ #include "content/public/common/result_codes.h" @@ -10,15 +10,46 @@ #include "sandbox/policy/linux/sandbox_linux.h" namespace content { -@@ -74,6 +76,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -45,14 +47,20 @@ ChildProcessLauncherHelper::GetFilesToMap() { + } + + bool ChildProcessLauncherHelper::IsUsingLaunchOptions() { ++#if !BUILDFLAG(IS_BSD) + return !GetZygoteForLaunch(); ++#else ++ return true; ++#endif + } + + bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread( + PosixFileDescriptorInfo& files_to_register, + base::LaunchOptions* options) { + if (options) { ++#if !BUILDFLAG(IS_BSD) + DCHECK(!GetZygoteForLaunch()); ++#endif + // Convert FD mapping to FileHandleMappingVector + options->fds_to_remap = files_to_register.GetMappingWithIDAdjustment( + base::GlobalDescriptors::kBaseDescriptor); +@@ -64,7 +72,9 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche + + options->environment = delegate_->GetEnvironment(); + } else { ++#if !BUILDFLAG(IS_BSD) + DCHECK(GetZygoteForLaunch()); ++#endif + // Environment variables could be supported in the future, but are not + // currently supported when launching with the zygote. + DCHECK(delegate_->GetEnvironment().empty()); +@@ -81,6 +91,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr int* launch_result) { *is_synchronous_launch = true; Process process; +#if !BUILDFLAG(IS_BSD) - ZygoteHandle zygote_handle = - base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) - ? nullptr -@@ -87,7 +90,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr + ZygoteCommunication* zygote_handle = GetZygoteForLaunch(); + if (zygote_handle) { + // TODO(crbug.com/569191): If chrome supported multiple zygotes they could +@@ -91,7 +102,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr GetProcessType()); *launch_result = LAUNCH_RESULT_SUCCESS; @@ -26,7 +57,7 @@ if (handle) { // It could be a renderer process or an utility process. int oom_score = content::kMiscOomScore; -@@ -96,15 +98,17 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -100,15 +110,17 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr oom_score = content::kLowestRendererOomScore; ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore(handle, oom_score); } @@ -36,7 +67,7 @@ process.zygote = zygote_handle; } else { +#endif - process.process = base::LaunchProcess(*command_line(), options); + process.process = base::LaunchProcess(*command_line(), *options); *launch_result = process.process.IsValid() ? LAUNCH_RESULT_SUCCESS : LAUNCH_RESULT_FAILURE; +#if !BUILDFLAG(IS_BSD) @@ -45,7 +76,7 @@ #if BUILDFLAG(IS_CHROMEOS) if (GetProcessType() == switches::kRendererProcess) { -@@ -124,10 +128,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper +@@ -130,10 +142,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper const ChildProcessLauncherHelper::Process& process, bool known_dead) { ChildProcessTerminationInfo info; @@ -60,7 +91,7 @@ info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(), &info.exit_code); } else { -@@ -151,13 +159,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer +@@ -157,13 +173,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer DCHECK(CurrentlyOnProcessLauncherTaskRunner()); process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. @@ -77,4 +108,18 @@ +#endif } - void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread( + void ChildProcessLauncherHelper::SetProcessBackgroundedOnLauncherThread( +@@ -174,11 +194,13 @@ void ChildProcessLauncherHelper::SetProcessBackgrounde + process.SetProcessBackgrounded(is_background); + } + ++#if !BUILDFLAG(IS_BSD) + ZygoteCommunication* ChildProcessLauncherHelper::GetZygoteForLaunch() { + return base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) + ? nullptr + : delegate_->GetZygote(); + } ++#endif + + base::File OpenFileToShare(const base::FilePath& path, + base::MemoryMappedFile::Region* region) { 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 05c74fd91983..f9f45b89a98c 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 2022-12-06 08:09:13 UTC +--- content/browser/compositor/viz_process_transport_factory.cc.orig 2023-03-13 07:33:08 UTC +++ content/browser/compositor/viz_process_transport_factory.cc -@@ -118,7 +118,7 @@ class HostDisplayClient : public viz::HostDisplayClien +@@ -116,7 +116,7 @@ class HostDisplayClient : public viz::HostDisplayClien // viz::HostDisplayClient: // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 35e2ce5c0c06..810a2049ea0a 100644 --- a/www/iridium/files/patch-content_browser_devtools_protocol_system__info__handler.cc +++ b/www/iridium/files/patch-content_browser_devtools_protocol_system__info__handler.cc @@ -1,6 +1,6 @@ ---- content/browser/devtools/protocol/system_info_handler.cc.orig 2023-01-17 19:19:00 UTC +--- content/browser/devtools/protocol/system_info_handler.cc.orig 2023-03-13 07:33:08 UTC +++ content/browser/devtools/protocol/system_info_handler.cc -@@ -49,7 +49,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS +@@ -50,7 +50,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_gpu_gpu__process__host.cc b/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc index 76a66502446b..e088966dfa1b 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 2022-12-06 08:09:13 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2023-03-13 07:33:08 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -255,6 +255,7 @@ static const char* const kSwitchNames[] = { +@@ -249,6 +249,7 @@ static const char* const kSwitchNames[] = { switches::kEnableBackgroundThreadPool, switches::kEnableGpuRasterization, switches::kEnableLogging, + switches::kDisableUnveil, - switches::kEnableDeJelly, - switches::kDeJellyScreenWidth, switches::kDoubleBufferCompositing, -@@ -288,7 +289,7 @@ static const char* const kSwitchNames[] = { + switches::kHeadless, + switches::kLoggingLevel, +@@ -280,7 +281,7 @@ static const char* const kSwitchNames[] = { switches::kOzoneDumpFile, switches::kDisableBufferBWCompression, #endif 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 75037f0c41ee..0789c7420c14 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 2023-01-17 19:19:00 UTC +--- content/browser/network_service_instance_impl.cc.orig 2023-03-13 07:33:08 UTC +++ content/browser/network_service_instance_impl.cc -@@ -75,7 +75,7 @@ +@@ -76,7 +76,7 @@ #include "content/browser/network/network_service_process_tracker_win.h" #endif @@ -9,12 +9,12 @@ #include "content/browser/system_dns_resolution/system_dns_resolver.h" #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h" #endif -@@ -403,7 +403,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS +@@ -404,7 +404,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS } #endif // BUILDFLAG(IS_POSIX) -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled( - network::features::kOutOfProcessSystemDnsResolution) && - IsOutOfProcessNetworkService() && + if (GetContentClient() + ->browser() + ->ShouldRunOutOfProcessSystemDnsResolution() && diff --git a/www/iridium/files/patch-content_browser_renderer__host_back__forward__cache__impl.cc b/www/iridium/files/patch-content_browser_renderer__host_back__forward__cache__impl.cc new file mode 100644 index 000000000000..3e57a96f3e71 --- /dev/null +++ b/www/iridium/files/patch-content_browser_renderer__host_back__forward__cache__impl.cc @@ -0,0 +1,11 @@ +--- content/browser/renderer_host/back_forward_cache_impl.cc.orig 2023-03-13 07:33:08 UTC ++++ content/browser/renderer_host/back_forward_cache_impl.cc +@@ -56,7 +56,7 @@ BASE_FEATURE(kBackForwardCacheSize, + // Sets the BackForwardCache size for desktop. + // See crbug.com/1291435. + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT 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 ca340df2e243..3dcbce4fc68c 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_delegated__frame__host.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_delegated__frame__host.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/delegated_frame_host.cc.orig 2022-10-05 07:34:01 UTC +--- content/browser/renderer_host/delegated_frame_host.cc.orig 2023-03-13 07:33:08 UTC +++ content/browser/renderer_host/delegated_frame_host.cc -@@ -289,7 +289,7 @@ void DelegatedFrameHost::EmbedSurface( +@@ -295,7 +295,7 @@ void DelegatedFrameHost::EmbedSurface( if (!primary_surface_id || primary_surface_id->local_surface_id() != local_surface_id_) { diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.cc b/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.cc deleted file mode 100644 index 7dff6c05f29b..000000000000 --- a/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- content/browser/renderer_host/render_message_filter.cc.orig 2022-12-06 08:09:13 UTC -+++ content/browser/renderer_host/render_message_filter.cc -@@ -66,7 +66,7 @@ - #if BUILDFLAG(IS_MAC) - #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" - #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "base/linux_util.h" - #include "base/threading/platform_thread.h" - #endif -@@ -130,7 +130,7 @@ void RenderMessageFilter::GenerateFrameRoutingID( - document_token); - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void RenderMessageFilter::SetThreadTypeOnWorkerThread( - base::PlatformThreadId ns_tid, - base::ThreadType thread_type) { -@@ -151,7 +151,7 @@ void RenderMessageFilter::SetThreadTypeOnWorkerThread( - } - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void RenderMessageFilter::SetThreadType(int32_t ns_tid, - base::ThreadType thread_type) { - constexpr base::TaskTraits kTraits = { diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.h b/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.h deleted file mode 100644 index cf0067ce67a9..000000000000 --- a/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.h +++ /dev/null @@ -1,18 +0,0 @@ ---- content/browser/renderer_host/render_message_filter.h.orig 2022-10-05 07:34:01 UTC -+++ content/browser/renderer_host/render_message_filter.h -@@ -78,13 +78,13 @@ class RenderMessageFilter - void GenerateRoutingID(GenerateRoutingIDCallback routing_id) override; - void GenerateFrameRoutingID(GenerateFrameRoutingIDCallback callback) override; - void HasGpuProcess(HasGpuProcessCallback callback) override; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void SetThreadType(int32_t ns_tid, base::ThreadType thread_type) override; - #endif - - void OnResolveProxy(const GURL& url, IPC::Message* reply_msg); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void SetThreadTypeOnWorkerThread(base::PlatformThreadId ns_tid, - base::ThreadType thread_type); - #endif diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index c39ba954ddb0..e493f395e606 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-01-17 19:19:00 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-03-13 07:33:08 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -215,7 +215,7 @@ +@@ -214,7 +214,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -1139,7 +1139,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1144,7 +1144,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,7 +18,7 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1226,7 +1226,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1236,7 +1236,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } @@ -27,7 +27,16 @@ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -2129,7 +2129,7 @@ void RenderProcessHostImpl::ReinitializeLogging( +@@ -1325,7 +1325,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public + std::unique_ptr<service_manager::BinderRegistry> binders_; + mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory> + video_encode_accelerator_factory_remote_; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -2173,7 +2173,7 @@ void RenderProcessHostImpl::ReinitializeLogging( } #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -36,16 +45,16 @@ void RenderProcessHostImpl::CreateStableVideoDecoder( mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) { if (!stable_video_decoder_factory_remote_.is_bound()) { -@@ -3284,6 +3284,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3348,6 +3348,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, + switches::kDisableUnveil, + switches::kTrk, + switches::kDisableUseMojoVideoDecoderForPepper, switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, - switches::kDisableWebGLImageChromium, -@@ -4757,7 +4759,7 @@ void RenderProcessHostImpl::ResetIPC() { +@@ -4826,7 +4828,7 @@ void RenderProcessHostImpl::ResetIPC() { coordinator_connector_receiver_.reset(); tracing_registration_.reset(); 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 6b72fbbaf892..f54b46e0a924 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 2023-01-17 19:19:00 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2023-03-13 07:33:08 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -84,7 +84,7 @@ +@@ -85,7 +85,7 @@ #include "content/public/browser/android/child_process_importance.h" #endif @@ -9,7 +9,7 @@ #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -484,7 +484,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -490,7 +490,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); @@ -18,7 +18,7 @@ // Launch the zygote early in the browser startup. static void EarlyZygoteLaunch(); #endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC) -@@ -684,7 +684,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -699,7 +699,7 @@ class CONTENT_EXPORT RenderProcessHostImpl mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) override; @@ -27,7 +27,7 @@ void CreateStableVideoDecoder( mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) override; -@@ -1139,7 +1139,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -1171,7 +1171,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // RenderProcessHost. This is destroyed early in ResetIPC() method. std::unique_ptr<PermissionServiceContext> permission_service_context_; diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc index ebfaa69f4eec..bee2c711885b 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2022-12-06 08:09:13 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2023-03-13 07:33:08 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -253,7 +253,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -250,7 +250,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); diff --git a/www/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 6a4ab0c17c29..686e2d8c2b6c 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-01-17 19:19:00 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-03-13 07:33:08 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -118,7 +118,7 @@ +@@ -119,7 +119,7 @@ #include "ui/gfx/gdi_util.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/linux/linux_ui.h" -@@ -451,7 +451,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -452,7 +452,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); @@ -18,7 +18,7 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1589,7 +1589,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1590,7 +1590,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return GetTextInputManager() && GetTextInputManager()->should_do_learning(); } @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2421,7 +2421,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2422,7 +2422,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2598,7 +2598,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2599,7 +2599,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/iridium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h b/www/iridium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h index b87b77bb446c..2128e734621c 100644 --- a/www/iridium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h +++ b/www/iridium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h @@ -1,6 +1,6 @@ ---- content/browser/scheduler/responsiveness/native_event_observer.h.orig 2022-03-28 18:11:04 UTC +--- content/browser/scheduler/responsiveness/native_event_observer.h.orig 2023-03-13 07:33:08 UTC +++ content/browser/scheduler/responsiveness/native_event_observer.h -@@ -15,7 +15,7 @@ +@@ -16,7 +16,7 @@ #include "content/public/browser/native_event_processor_observer_mac.h" #endif @@ -9,7 +9,7 @@ #include "ui/aura/window_event_dispatcher_observer.h" #endif -@@ -40,7 +40,7 @@ namespace responsiveness { +@@ -41,7 +41,7 @@ namespace responsiveness { class CONTENT_EXPORT NativeEventObserver #if BUILDFLAG(IS_MAC) : public NativeEventProcessorObserver @@ -18,7 +18,7 @@ : public aura::WindowEventDispatcherObserver #elif BUILDFLAG(IS_WIN) : public base::MessagePumpForUI::Observer -@@ -57,7 +57,7 @@ class CONTENT_EXPORT NativeEventObserver +@@ -58,7 +58,7 @@ class CONTENT_EXPORT NativeEventObserver NativeEventObserver(WillRunEventCallback will_run_event_callback, DidRunEventCallback did_run_event_callback); @@ -27,7 +27,7 @@ NativeEventObserver(const NativeEventObserver&) = delete; NativeEventObserver& operator=(const NativeEventObserver&) = delete; -@@ -73,7 +73,7 @@ class CONTENT_EXPORT NativeEventObserver +@@ -74,7 +74,7 @@ class CONTENT_EXPORT NativeEventObserver // Exposed for tests. void WillRunNativeEvent(const void* opaque_identifier) override; void DidRunNativeEvent(const void* opaque_identifier) override; @@ -36,12 +36,12 @@ // aura::WindowEventDispatcherObserver overrides: void OnWindowEventDispatcherStartedProcessing( aura::WindowEventDispatcher* dispatcher, -@@ -90,7 +90,7 @@ class CONTENT_EXPORT NativeEventObserver +@@ -91,7 +91,7 @@ class CONTENT_EXPORT NativeEventObserver void RegisterObserver(); void DeregisterObserver(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) struct EventInfo { - const void* unique_id; + raw_ptr<const void> unique_id; }; 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 0e413dc7b0ee..51c2a662976d 100644 --- a/www/iridium/files/patch-content_browser_utility__sandbox__delegate.cc +++ b/www/iridium/files/patch-content_browser_utility__sandbox__delegate.cc @@ -1,6 +1,6 @@ ---- content/browser/utility_sandbox_delegate.cc.orig 2023-01-17 19:19:00 UTC +--- content/browser/utility_sandbox_delegate.cc.orig 2023-03-13 07:33:08 UTC +++ content/browser/utility_sandbox_delegate.cc -@@ -63,13 +63,13 @@ UtilitySandboxedProcessLauncherDelegate:: +@@ -64,13 +64,13 @@ UtilitySandboxedProcessLauncherDelegate:: #if BUILDFLAG(ENABLE_PPAPI) sandbox_type_ == sandbox::mojom::Sandbox::kPpapi || #endif @@ -17,7 +17,7 @@ sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -112,10 +112,10 @@ ZygoteHandle UtilitySandboxedProcessLauncherDelegate:: +@@ -117,10 +117,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe // unsandboxed zygote and then apply their actual sandboxes in the forked // process upon startup. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork || diff --git a/www/iridium/files/patch-content_browser_v8__snapshot__files.cc b/www/iridium/files/patch-content_browser_v8__snapshot__files.cc index 61af7e227367..8a735f565b66 100644 --- a/www/iridium/files/patch-content_browser_v8__snapshot__files.cc +++ b/www/iridium/files/patch-content_browser_v8__snapshot__files.cc @@ -1,11 +1,11 @@ ---- content/browser/v8_snapshot_files.cc.orig 2022-03-28 18:11:04 UTC +--- content/browser/v8_snapshot_files.cc.orig 2023-03-13 07:33:08 UTC +++ content/browser/v8_snapshot_files.cc -@@ -10,7 +10,7 @@ - namespace content { - - std::map<std::string, base::FilePath> GetV8SnapshotFilesToPreload() { +@@ -13,7 +13,7 @@ namespace content { + std::map<std::string, absl::variant<base::FilePath, base::ScopedFD>> + GetV8SnapshotFilesToPreload() { + std::map<std::string, absl::variant<base::FilePath, base::ScopedFD>> files; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #if defined(USE_V8_CONTEXT_SNAPSHOT) - return {{kV8ContextSnapshotDataDescriptor, - base::FilePath(FILE_PATH_LITERAL(V8_CONTEXT_SNAPSHOT_FILENAME))}}; + #if BUILDFLAG(USE_V8_CONTEXT_SNAPSHOT) + files[kV8ContextSnapshotDataDescriptor] = base::FilePath( + FILE_PATH_LITERAL(BUILDFLAG(V8_CONTEXT_SNAPSHOT_FILENAME))); 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 0615c2260082..1f6f0aee822d 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 2023-01-17 19:19:00 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2023-03-13 07:33:08 UTC +++ content/browser/web_contents/web_contents_view_aura.cc @@ -178,7 +178,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr<aura::Window> window_; @@ -18,7 +18,7 @@ // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over // a shortcut so we add it first. -@@ -1368,7 +1368,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1371,7 +1371,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 185ef6bf8c36..99e783347692 100644 --- a/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc +++ b/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc @@ -1,4 +1,4 @@ ---- content/browser/webui/web_ui_main_frame_observer.cc.orig 2022-10-05 07:34:01 UTC +--- content/browser/webui/web_ui_main_frame_observer.cc.orig 2023-03-13 07:33:08 UTC +++ content/browser/webui/web_ui_main_frame_observer.cc @@ -13,7 +13,7 @@ #include "content/public/browser/navigation_handle.h" @@ -6,8 +6,8 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "base/callback_helpers.h" #include "base/feature_list.h" + #include "base/functional/callback_helpers.h" #include "base/logging.h" @@ -31,7 +31,7 @@ namespace content { 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 5648a37f553e..5cdca9331e95 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,4 +1,4 @@ ---- content/browser/zygote_host/zygote_host_impl_linux.h.orig 2022-12-06 08:09:13 UTC +--- 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 @@ -47,12 +47,14 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHos base::ScopedFD* control_fd, @@ -7,10 +7,10 @@ +#if !BUILDFLAG(IS_BSD) void AdjustRendererOOMScore(base::ProcessHandle process_handle, int score) override; - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS) void ReinitializeLogging(uint32_t logging_dest, base::PlatformFile log_file_fd) override; - #endif + #endif // BUILDFLAG(IS_CHROMEOS) +#endif bool HasZygote() { return !zygote_pids_.empty(); } diff --git a/www/iridium/files/patch-content_common_BUILD.gn b/www/iridium/files/patch-content_common_BUILD.gn index 7fca76c6cb8b..1a377febc730 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 2023-01-17 19:19:00 UTC +--- content/common/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ content/common/BUILD.gn -@@ -433,6 +433,9 @@ if (is_linux || is_chromeos) { +@@ -426,6 +426,9 @@ if (is_linux || is_chromeos) { public = [ "set_process_title_linux.h" ] sources = [ "set_process_title_linux.cc" ] deps = [ "//base" ] @@ -10,3 +10,12 @@ } } +@@ -474,7 +477,7 @@ mojom("mojo_bindings") { + if (enable_ipc_logging) { + enabled_features += [ "ipc_logging" ] + } +- if (is_linux || is_chromeos) { ++ if (!is_bsd && (is_linux || is_chromeos)) { + enabled_features += [ "supports_thread_types" ] + } + if (use_clang_profiling_inside_sandbox) { diff --git a/www/iridium/files/patch-content_common_font__list__unittest.cc b/www/iridium/files/patch-content_common_font__list__unittest.cc index 18c18542fdd0..e22751425254 100644 --- a/www/iridium/files/patch-content_common_font__list__unittest.cc +++ b/www/iridium/files/patch-content_common_font__list__unittest.cc @@ -1,6 +1,6 @@ ---- content/common/font_list_unittest.cc.orig 2022-10-05 07:34:01 UTC +--- content/common/font_list_unittest.cc.orig 2023-03-13 07:33:08 UTC +++ content/common/font_list_unittest.cc -@@ -48,7 +48,7 @@ TEST(FontList, GetFontList) { +@@ -47,7 +47,7 @@ TEST(FontList, GetFontList) { EXPECT_TRUE(HasFontWithName(fonts, "MS Gothic", "MS Gothic")); EXPECT_TRUE(HasFontWithName(fonts, "Segoe UI", "Segoe UI")); EXPECT_TRUE(HasFontWithName(fonts, "Verdana", "Verdana")); diff --git a/www/iridium/files/patch-content_gpu_gpu__main.cc b/www/iridium/files/patch-content_gpu_gpu__main.cc index 835e7ae186f5..99bb0de8991f 100644 --- a/www/iridium/files/patch-content_gpu_gpu__main.cc +++ b/www/iridium/files/patch-content_gpu_gpu__main.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_main.cc.orig 2023-01-17 19:19:00 UTC +--- content/gpu/gpu_main.cc.orig 2023-03-13 07:33:08 UTC +++ content/gpu/gpu_main.cc -@@ -87,7 +87,7 @@ +@@ -88,7 +88,7 @@ #include "sandbox/win/src/sandbox.h" #endif @@ -9,7 +9,7 @@ #include "content/gpu/gpu_sandbox_hook_linux.h" #include "sandbox/policy/linux/sandbox_linux.h" #include "sandbox/policy/sandbox_type.h" -@@ -108,7 +108,7 @@ namespace content { +@@ -109,7 +109,7 @@ namespace content { namespace { @@ -18,7 +18,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -170,7 +170,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -171,7 +171,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { @@ -27,7 +27,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif BUILDFLAG(IS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -267,7 +267,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -269,7 +269,7 @@ int GpuMain(MainFunctionParams parameters) { std::make_unique<base::SingleThreadTaskExecutor>( gpu_preferences.message_pump_type); } @@ -36,7 +36,7 @@ #error "Unsupported Linux platform." #elif BUILDFLAG(IS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -402,7 +402,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -404,7 +404,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { diff --git a/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc b/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc index e464deb52434..52ce8a2a3dd0 100644 --- a/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc +++ b/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2023-01-17 19:19:00 UTC +--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2023-03-13 07:33:08 UTC +++ content/gpu/gpu_sandbox_hook_linux.cc @@ -126,6 +126,7 @@ void AddStandardChromeOsPermissions( } @@ -8,7 +8,7 @@ void AddV4L2GpuPermissions( std::vector<BrokerFilePermission>* permissions, const sandbox::policy::SandboxSeccompBPF::Options& options) { -@@ -445,8 +446,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp +@@ -481,8 +482,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp AddStandardGpuPermissions(&permissions); return permissions; } @@ -19,7 +19,7 @@ // Preload the Mali library. if (UseChromecastSandboxAllowlist()) { for (const char* path : kAllowedChromecastPaths) { -@@ -488,6 +491,7 @@ void LoadArmGpuLibraries() { +@@ -527,6 +530,7 @@ void LoadArmGpuLibraries() { dlopen(driver_paths[i], dlopen_flag); } } @@ -27,7 +27,7 @@ } bool LoadAmdGpuLibraries() { -@@ -555,12 +559,14 @@ void LoadV4L2Libraries( +@@ -594,12 +598,14 @@ void LoadV4L2Libraries( } void LoadChromecastV4L2Libraries() { @@ -42,7 +42,7 @@ } bool LoadLibrariesForGpu( -@@ -588,6 +594,7 @@ bool LoadLibrariesForGpu( +@@ -626,6 +632,7 @@ bool LoadLibrariesForGpu( return true; } @@ -50,7 +50,7 @@ sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU( const sandbox::policy::SandboxLinux::Options& options) { sandbox::syscall_broker::BrokerCommandSet command_set; -@@ -610,13 +617,17 @@ bool BrokerProcessPreSandboxHook( +@@ -649,13 +656,17 @@ bool BrokerProcessPreSandboxHook( SetProcessTitleFromCommandLine(nullptr); return true; } diff --git a/www/iridium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc b/www/iridium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc index e7a1bb7ff4fb..b3f5ced48cd6 100644 --- a/www/iridium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc +++ b/www/iridium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc @@ -1,6 +1,6 @@ ---- content/ppapi_plugin/ppapi_plugin_main.cc.orig 2022-12-06 08:09:13 UTC +--- content/ppapi_plugin/ppapi_plugin_main.cc.orig 2023-03-13 07:33:08 UTC +++ content/ppapi_plugin/ppapi_plugin_main.cc -@@ -53,6 +53,11 @@ +@@ -54,6 +54,11 @@ #include "gin/v8_initializer.h" #endif @@ -12,7 +12,7 @@ #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) #include <stdlib.h> #endif -@@ -146,7 +151,7 @@ int PpapiPluginMain(MainFunctionParams parameters) { +@@ -148,7 +153,7 @@ int PpapiPluginMain(MainFunctionParams parameters) { gin::V8Initializer::LoadV8Snapshot(); #endif diff --git a/www/iridium/files/patch-content_public_browser_render__process__host.h b/www/iridium/files/patch-content_public_browser_render__process__host.h index e0b542ab3e1d..c02eba2674a1 100644 --- a/www/iridium/files/patch-content_public_browser_render__process__host.h +++ b/www/iridium/files/patch-content_public_browser_render__process__host.h @@ -1,6 +1,6 @@ ---- content/public/browser/render_process_host.h.orig 2023-01-17 19:19:00 UTC +--- content/public/browser/render_process_host.h.orig 2023-03-13 07:33:08 UTC +++ content/public/browser/render_process_host.h -@@ -54,7 +54,7 @@ +@@ -53,7 +53,7 @@ #include "content/public/browser/android/child_process_importance.h" #endif @@ -9,7 +9,7 @@ #include "media/mojo/mojom/stable/stable_video_decoder.mojom-forward.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -629,7 +629,7 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::S +@@ -641,7 +641,7 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::S const blink::StorageKey& storage_key, mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) = 0; 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 d1d494756fea..4482260daf7f 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,4 +1,4 @@ ---- content/public/browser/zygote_host/zygote_host_linux.h.orig 2022-12-06 08:09:13 UTC +--- 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 @@ -35,11 +35,13 @@ class ZygoteHost { // after the first render has been forked. @@ -12,5 +12,5 @@ int score) = 0; +#endif - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS) // Reinitialize logging for the Zygote processes. Needed on ChromeOS, which diff --git a/www/iridium/files/patch-content_public_common_common__param__traits__macros.h b/www/iridium/files/patch-content_public_common_common__param__traits__macros.h index c202945d55c5..bef2455a7fd9 100644 --- a/www/iridium/files/patch-content_public_common_common__param__traits__macros.h +++ b/www/iridium/files/patch-content_public_common_common__param__traits__macros.h @@ -1,6 +1,6 @@ ---- content/public/common/common_param_traits_macros.h.orig 2022-12-01 10:35:46 UTC +--- content/public/common/common_param_traits_macros.h.orig 2023-03-13 07:33:08 UTC +++ content/public/common/common_param_traits_macros.h -@@ -125,7 +125,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::RendererPreferences) +@@ -113,7 +113,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::RendererPreferences) IPC_STRUCT_TRAITS_MEMBER(accept_languages) IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed) IPC_STRUCT_TRAITS_MEMBER(caret_browsing_enabled) 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 1aac07e76cd9..c3b4de5a84bb 100644 --- a/www/iridium/files/patch-content_public_common_content__features.cc +++ b/www/iridium/files/patch-content_public_common_content__features.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_features.cc.orig 2023-01-17 19:19:00 UTC +--- content/public/common/content_features.cc.orig 2023-03-13 07:33:08 UTC +++ content/public/common/content_features.cc -@@ -41,7 +41,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, +@@ -39,7 +39,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, "AudioServiceOutOfProcess", // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -53,7 +53,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, +@@ -51,7 +51,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, // kAudioServiceOutOfProcess feature is enabled. BASE_FEATURE(kAudioServiceSandbox, "AudioServiceSandbox", @@ -18,16 +18,16 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1251,7 +1251,7 @@ BASE_FEATURE(kWebAssemblyCodeProtection, - "WebAssemblyCodeProtection", - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -539,7 +539,7 @@ BASE_FEATURE(kGetDisplayMediaSetAutoSelectAllScreens, + // (activated by kUserAgentClientHint) + BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT); --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) - // Use memory protection keys in userspace (PKU) (if available) to protect code - // JITed for WebAssembly. Fall back to traditional memory protection if - // WebAssemblyCodeProtection is also enabled. -@@ -1287,7 +1287,7 @@ BASE_FEATURE(kWebAssemblyTiering, +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Supports proxying thread type changes of renderer processes to browser + // process and having browser process handle adjusting thread properties (nice + // value, c-group, latency sensitivity...) for renderers which have sandbox +@@ -1333,7 +1333,7 @@ BASE_FEATURE(kWebAssemblyTiering, BASE_FEATURE(kWebAssemblyTrapHandler, "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -36,7 +36,7 @@ defined(ARCH_CPU_X86_64)) || \ (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -1362,7 +1362,11 @@ BASE_FEATURE(kWebUIReportOnlyTrustedTypes, +@@ -1404,7 +1404,11 @@ BASE_FEATURE(kWebUICodeCache, // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb diff --git a/www/iridium/files/patch-content_public_common_content__features.h b/www/iridium/files/patch-content_public_common_content__features.h index 5a655f330d14..36a4de583de9 100644 --- a/www/iridium/files/patch-content_public_common_content__features.h +++ b/www/iridium/files/patch-content_public_common_content__features.h @@ -1,11 +1,11 @@ ---- content/public/common/content_features.h.orig 2023-01-17 19:19:00 UTC +--- content/public/common/content_features.h.orig 2023-03-13 07:33:08 UTC +++ content/public/common/content_features.h -@@ -272,7 +272,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kVideoPlaybackQual - CONTENT_EXPORT BASE_DECLARE_FEATURE(kV8VmFuture); - CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyBaseline); - CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyCodeProtection); --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) - CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyCodeProtectionPku); - #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && - // defined(ARCH_CPU_X86_64) +@@ -114,7 +114,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollO + CONTENT_EXPORT BASE_DECLARE_FEATURE(kGetDisplayMediaSet); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kGetDisplayMediaSetAutoSelectAllScreens); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kGreaseUACH); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + CONTENT_EXPORT BASE_DECLARE_FEATURE(kHandleRendererThreadTypeChangesInBrowser); + #endif + CONTENT_EXPORT BASE_DECLARE_FEATURE(kIdleDetection); 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 e454425a19da..202dddba8d91 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 2022-12-06 08:09:13 UTC +--- content/public/common/content_switches.cc.orig 2023-03-13 07:33:08 UTC +++ content/public/common/content_switches.cc -@@ -367,6 +367,10 @@ const char kEnableGpuMemoryBufferVideoFrames[] = +@@ -359,6 +359,10 @@ const char kEnableGpuMemoryBufferVideoFrames[] = // builds. const char kEnableLogging[] = "enable-logging"; @@ -11,7 +11,7 @@ // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables // triggering of change attribute of the NetInfo API when there is a change in // the connection type. -@@ -994,7 +998,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -995,7 +999,7 @@ const char kEnableAutomation[] = "enable-automation"; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-content_public_common_content__switches.h b/www/iridium/files/patch-content_public_common_content__switches.h index 937fe323fcae..1a6f6f17451a 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 2022-12-06 08:09:13 UTC +--- content/public/common/content_switches.h.orig 2023-03-13 07:33:08 UTC +++ content/public/common/content_switches.h -@@ -118,6 +118,8 @@ CONTENT_EXPORT extern const char kEnableBlinkTestFeatu +@@ -116,6 +116,8 @@ CONTENT_EXPORT extern const char kEnableBlinkTestFeatu CONTENT_EXPORT extern const char kEnableGpuMemoryBufferVideoFrames[]; CONTENT_EXPORT extern const char kEnableLCDText[]; CONTENT_EXPORT extern const char kEnableLogging[]; @@ -9,7 +9,7 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -269,7 +271,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD +@@ -268,7 +270,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-content_public_common_zygote_features.gni b/www/iridium/files/patch-content_public_common_zygote_features.gni index 43990a40b940..094f8ed0c45a 100644 --- a/www/iridium/files/patch-content_public_common_zygote_features.gni +++ b/www/iridium/files/patch-content_public_common_zygote_features.gni @@ -1,8 +1,8 @@ ---- content/public/common/zygote/features.gni.orig 2022-03-28 18:11:04 UTC +--- content/public/common/zygote/features.gni.orig 2023-03-13 07:33:08 UTC +++ content/public/common/zygote/features.gni @@ -2,4 +2,4 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. --use_zygote_handle = is_posix && !is_android && !is_mac -+use_zygote_handle = is_posix && !is_android && !is_mac && !is_bsd +-use_zygote = is_posix && !is_android && !is_mac ++use_zygote = is_posix && !is_android && !is_mac && !is_bsd diff --git a/www/iridium/files/patch-content_public_test_mock__render__process__host.h b/www/iridium/files/patch-content_public_test_mock__render__process__host.h index bfebbb35a154..3504ca2c93be 100644 --- a/www/iridium/files/patch-content_public_test_mock__render__process__host.h +++ b/www/iridium/files/patch-content_public_test_mock__render__process__host.h @@ -1,6 +1,6 @@ ---- content/public/test/mock_render_process_host.h.orig 2023-01-17 19:19:00 UTC +--- content/public/test/mock_render_process_host.h.orig 2023-03-13 07:33:08 UTC +++ content/public/test/mock_render_process_host.h -@@ -267,7 +267,7 @@ class MockRenderProcessHost : public RenderProcessHost +@@ -276,7 +276,7 @@ class MockRenderProcessHost : public RenderProcessHost const blink::StorageKey& storage_key, mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) override {} diff --git a/www/iridium/files/patch-content_public_test_mock__render__thread.cc b/www/iridium/files/patch-content_public_test_mock__render__thread.cc index 4e3000f34078..129db6602e31 100644 --- a/www/iridium/files/patch-content_public_test_mock__render__thread.cc +++ b/www/iridium/files/patch-content_public_test_mock__render__thread.cc @@ -1,6 +1,6 @@ ---- content/public/test/mock_render_thread.cc.orig 2023-01-17 19:19:00 UTC +--- content/public/test/mock_render_thread.cc.orig 2023-03-13 07:33:08 UTC +++ content/public/test/mock_render_thread.cc -@@ -65,7 +65,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend +@@ -64,7 +64,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend std::move(callback).Run(false); } diff --git a/www/iridium/files/patch-content_renderer_BUILD.gn b/www/iridium/files/patch-content_renderer_BUILD.gn new file mode 100644 index 000000000000..880992270e0c --- /dev/null +++ b/www/iridium/files/patch-content_renderer_BUILD.gn @@ -0,0 +1,16 @@ +--- content/renderer/BUILD.gn.orig 2023-03-13 07:33:08 UTC ++++ content/renderer/BUILD.gn +@@ -200,6 +200,13 @@ target(link_target_type, "renderer") { + ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "renderer_thread_type_handler.cc", ++ "renderer_thread_type_handler.h", ++ ] ++ } ++ + if (is_mac) { + sources += [ + "renderer_main_platform_delegate_mac.mm", diff --git a/www/iridium/files/patch-content_renderer_render__process__impl.cc b/www/iridium/files/patch-content_renderer_render__process__impl.cc index 20f882f95957..5bd4eaa69ae0 100644 --- a/www/iridium/files/patch-content_renderer_render__process__impl.cc +++ b/www/iridium/files/patch-content_renderer_render__process__impl.cc @@ -1,4 +1,4 @@ ---- content/renderer/render_process_impl.cc.orig 2023-01-17 19:19:00 UTC +--- content/renderer/render_process_impl.cc.orig 2023-03-13 07:33:08 UTC +++ content/renderer/render_process_impl.cc @@ -46,7 +46,7 @@ #if BUILDFLAG(IS_WIN) @@ -9,16 +9,7 @@ #include "v8/include/v8-wasm-trap-handler-posix.h" #endif -@@ -154,7 +154,7 @@ RenderProcessImpl::RenderProcessImpl() - SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtection, - "--no-wasm-write-protect-code-memory"); - --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) - SetV8FlagIfFeature(features::kWebAssemblyCodeProtectionPku, - "--wasm-memory-protection-keys"); - SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtectionPku, -@@ -224,7 +224,7 @@ RenderProcessImpl::RenderProcessImpl() +@@ -223,7 +223,7 @@ RenderProcessImpl::RenderProcessImpl() SetV8FlagIfNotFeature(features::kWebAssemblyDynamicTiering, "--no-wasm-dynamic-tiering"); 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 521bb9d20d5c..365e847b7d35 100644 --- a/www/iridium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/iridium/files/patch-content_renderer_render__thread__impl.cc @@ -1,24 +1,15 @@ ---- content/renderer/render_thread_impl.cc.orig 2023-01-17 19:19:00 UTC +--- content/renderer/render_thread_impl.cc.orig 2023-03-13 07:33:08 UTC +++ content/renderer/render_thread_impl.cc -@@ -194,7 +194,7 @@ +@@ -200,6 +200,8 @@ #if BUILDFLAG(IS_MAC) #include <malloc/malloc.h> --#else -+#elif !BUILDFLAG(IS_OPENBSD) ++#elif BUILDFLAG(IS_BSD) ++#include <stdlib.h> + #else #include <malloc.h> #endif - -@@ -665,7 +665,7 @@ void RenderThreadImpl::Init() { - base::DiscardableMemoryAllocator::SetInstance( - discardable_memory_allocator_.get()); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - render_message_filter()->SetThreadType( - ChildProcess::current()->io_thread_id(), base::ThreadType::kCompositing); - #endif -@@ -1043,7 +1043,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1051,7 +1053,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: kGpuStreamPriorityMedia); const bool enable_video_decode_accelerator = @@ -27,12 +18,21 @@ base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && #endif // BUILDFLAG(IS_LINUX) !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1053,7 +1053,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1060,7 +1062,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: + gpu::kGpuFeatureStatusEnabled); const bool enable_video_encode_accelerator = - -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) && +@@ -1843,7 +1845,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create + bool enable_video_encode_accelerator) { + mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider> + vea_provider; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled(media::kUseOutOfProcessVideoEncoding)) { + BindHostReceiver(vea_provider.InitWithNewPipeAndPassReceiver()); + } else { 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 626f35929c26..7f6110bc6c97 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,4 +1,4 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2023-01-17 19:19:00 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2023-03-13 07:33:08 UTC +++ content/renderer/renderer_blink_platform_impl.cc @@ -112,7 +112,7 @@ @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -182,7 +182,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -178,7 +178,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( main_thread_scheduler_(main_thread_scheduler) { // RenderThread may not exist in some tests. if (RenderThreadImpl::current()) { @@ -18,7 +18,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -192,7 +192,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -188,7 +188,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -27,16 +27,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -263,7 +263,7 @@ RendererBlinkPlatformImpl::WrapURLLoaderFactory( - /*terminate_sync_load_event=*/nullptr); - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void RendererBlinkPlatformImpl::SetThreadType(base::PlatformThreadId thread_id, - base::ThreadType thread_type) { - if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) { -@@ -274,7 +274,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -270,7 +270,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 bcba62e2e8f7..89b41627127a 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 2023-01-17 19:19:00 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2023-03-13 07:33:08 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -30,7 +30,7 @@ +@@ -31,7 +31,7 @@ #include "third_party/blink/public/common/user_agent/user_agent_metadata.h" #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h" @@ -9,16 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -172,7 +172,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi - const blink::WebURL& top_document_web_url) override; - gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; - blink::WebString ConvertIDNToUnicode(const blink::WebString& host) override; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void SetThreadType(base::PlatformThreadId thread_id, - base::ThreadType) override; - #endif -@@ -240,7 +240,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -245,7 +245,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) const; @@ -27,7 +18,7 @@ std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif -@@ -260,7 +260,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -265,7 +265,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi mutable base::WaitableEvent io_thread_id_ready_event_; base::PlatformThreadId io_thread_id_ = base::kInvalidThreadId; diff --git a/www/iridium/files/patch-content_shell_BUILD.gn b/www/iridium/files/patch-content_shell_BUILD.gn index d42d9aa1da8f..90f7a629f87d 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 2023-01-17 19:19:00 UTC +--- content/shell/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ content/shell/BUILD.gn -@@ -901,7 +901,7 @@ group("content_shell_crash_test") { +@@ -905,7 +905,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc b/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc index 3d303d29a725..aea842b37df7 100644 --- a/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc +++ b/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc @@ -1,6 +1,6 @@ ---- content/shell/app/shell_main_delegate.cc.orig 2022-12-01 10:35:46 UTC +--- content/shell/app/shell_main_delegate.cc.orig 2023-03-13 07:33:08 UTC +++ content/shell/app/shell_main_delegate.cc -@@ -213,7 +213,7 @@ void ShellMainDelegate::PreSandboxStartup() { +@@ -214,7 +214,7 @@ void ShellMainDelegate::PreSandboxStartup() { // Reporting for sub-processes will be initialized in ZygoteForked. if (process_type != switches::kZygoteProcess) { crash_reporter::InitializeCrashpad(process_type.empty(), process_type); diff --git a/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc index 3b5f453b280b..708481cae626 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,4 +1,4 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2022-12-01 10:35:46 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2023-03-13 07:33:08 UTC +++ content/shell/browser/shell_browser_main_parts.cc @@ -50,7 +50,7 @@ #include "net/base/network_change_notifier.h" @@ -27,7 +27,7 @@ ui::InitializeInputMethodForTesting(); #endif #if BUILDFLAG(IS_ANDROID) -@@ -153,7 +153,7 @@ void ShellBrowserMainParts::ToolkitInitialized() { +@@ -158,7 +158,7 @@ void ShellBrowserMainParts::ToolkitInitialized() { if (switches::IsRunWebTestsSwitchPresent()) return; @@ -36,7 +36,7 @@ ui::LinuxUi::SetInstance(ui::GetDefaultLinuxUi()); #endif } -@@ -196,7 +196,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() { +@@ -201,7 +201,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() { ShellDevToolsManagerDelegate::StopHttpHandler(); browser_context_.reset(); off_the_record_browser_context_.reset(); diff --git a/www/iridium/files/patch-content_shell_utility_shell__content__utility__client.cc b/www/iridium/files/patch-content_shell_utility_shell__content__utility__client.cc index c84155dff55f..e0943b2f7555 100644 --- a/www/iridium/files/patch-content_shell_utility_shell__content__utility__client.cc +++ b/www/iridium/files/patch-content_shell_utility_shell__content__utility__client.cc @@ -1,6 +1,6 @@ ---- content/shell/utility/shell_content_utility_client.cc.orig 2023-01-17 19:19:00 UTC +--- content/shell/utility/shell_content_utility_client.cc.orig 2023-03-13 07:33:08 UTC +++ content/shell/utility/shell_content_utility_client.cc -@@ -34,7 +34,7 @@ +@@ -38,7 +38,7 @@ #include "sandbox/policy/sandbox.h" #include "services/test/echo/echo_service.h" @@ -9,10 +9,10 @@ #include "content/test/sandbox_status_service.h" #endif -@@ -155,7 +155,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrow +@@ -187,7 +187,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrow binders->Add<mojom::PowerMonitorTest>( base::BindRepeating(&PowerMonitorTestImpl::MakeSelfOwnedReceiver), - base::ThreadTaskRunnerHandle::Get()); + base::SingleThreadTaskRunner::GetCurrentDefault()); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (register_sandbox_status_helper_) { diff --git a/www/iridium/files/patch-content_test_BUILD.gn b/www/iridium/files/patch-content_test_BUILD.gn index c519fdb2f6ce..c1012c3127b3 100644 --- a/www/iridium/files/patch-content_test_BUILD.gn +++ b/www/iridium/files/patch-content_test_BUILD.gn @@ -1,6 +1,6 @@ ---- content/test/BUILD.gn.orig 2023-01-17 19:19:00 UTC +--- content/test/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ content/test/BUILD.gn -@@ -2038,7 +2038,7 @@ static_library("run_all_unittests") { +@@ -2103,7 +2103,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -9,7 +9,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -3031,7 +3031,7 @@ test("content_unittests") { +@@ -3130,7 +3130,7 @@ test("content_unittests") { deps += [ "//third_party/boringssl" ] } diff --git a/www/iridium/files/patch-content_utility_services.cc b/www/iridium/files/patch-content_utility_services.cc index 9896bf30e92c..c52b7a846a65 100644 --- a/www/iridium/files/patch-content_utility_services.cc +++ b/www/iridium/files/patch-content_utility_services.cc @@ -1,4 +1,4 @@ ---- content/utility/services.cc.orig 2023-01-17 19:19:00 UTC +--- content/utility/services.cc.orig 2023-03-13 07:33:08 UTC +++ content/utility/services.cc @@ -64,7 +64,7 @@ extern sandbox::TargetServices* g_utility_target_services; @@ -6,10 +6,10 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #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" - #include "sandbox/policy/sandbox_type.h" -@@ -86,7 +86,7 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -87,7 +87,7 @@ extern sandbox::TargetServices* g_utility_target_servi #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -18,7 +18,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) #include "media/mojo/services/stable_video_decoder_factory_service.h" // nogncheck #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && -@@ -209,7 +209,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi +@@ -215,7 +215,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi << "task_policy_set TASK_QOS_POLICY"; #endif @@ -27,7 +27,7 @@ auto* command_line = base::CommandLine::ForCurrentProcess(); if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) { -@@ -311,7 +311,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( +@@ -319,7 +319,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -36,7 +36,16 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) auto RunStableVideoDecoderFactoryService( mojo::PendingReceiver<media::stable::mojom::StableVideoDecoderFactory> -@@ -365,7 +365,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -331,7 +331,7 @@ auto RunStableVideoDecoderFactoryService( + #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && + // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + auto RunVideoEncodeAcceleratorProviderFactory( + mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory> + receiver) { +@@ -389,13 +389,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -45,3 +54,10 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) services.Add(RunStableVideoDecoderFactoryService); #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && + // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + services.Add(RunVideoEncodeAcceleratorProviderFactory); + #endif // 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 9016789e1fae..905c8485ec64 100644 --- a/www/iridium/files/patch-content_utility_utility__main.cc +++ b/www/iridium/files/patch-content_utility_utility__main.cc @@ -1,4 +1,4 @@ ---- content/utility/utility_main.cc.orig 2023-01-17 19:19:00 UTC +--- content/utility/utility_main.cc.orig 2023-03-13 07:33:08 UTC +++ content/utility/utility_main.cc @@ -31,7 +31,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" @@ -54,7 +54,7 @@ sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding; -@@ -156,7 +162,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -168,7 +174,7 @@ int UtilityMain(MainFunctionParams parameters) { } } @@ -63,7 +63,7 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -184,7 +190,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -196,7 +202,7 @@ int UtilityMain(MainFunctionParams parameters) { pre_sandbox_hook = base::BindOnce(&screen_ai::ScreenAIPreSandboxHook); break; #endif @@ -72,7 +72,7 @@ case sandbox::mojom::Sandbox::kHardwareVideoDecoding: pre_sandbox_hook = base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); -@@ -211,6 +217,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -223,6 +229,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -80,7 +80,7 @@ if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { sandbox::policy::SandboxLinux::Options sandbox_options; -@@ -219,6 +226,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -231,6 +238,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 680aa076f02c..9717f82a3082 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 2022-12-06 08:09:13 UTC +--- content/zygote/zygote_linux.cc.orig 2023-03-13 07:33:08 UTC +++ content/zygote/zygote_linux.cc @@ -1,6 +1,7 @@ // Copyright 2012 The Chromium Authors @@ -8,7 +8,7 @@ #include "content/zygote/zygote_linux.h" -@@ -696,3 +697,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi +@@ -706,3 +707,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 85e654ba2e4b..98cf9c5a1f1a 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 2022-03-28 18:11:04 UTC +--- device/gamepad/gamepad_provider.cc.orig 2023-03-13 07:33:08 UTC +++ device/gamepad/gamepad_provider.cc -@@ -216,7 +216,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep +@@ -219,7 +219,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_extension__prefs.cc b/www/iridium/files/patch-extensions_browser_extension__prefs.cc index cbe9b205dc0f..9d5b4811e360 100644 --- a/www/iridium/files/patch-extensions_browser_extension__prefs.cc +++ b/www/iridium/files/patch-extensions_browser_extension__prefs.cc @@ -1,6 +1,6 @@ ---- extensions/browser/extension_prefs.cc.orig 2023-01-17 19:19:00 UTC +--- extensions/browser/extension_prefs.cc.orig 2023-03-13 07:33:08 UTC +++ extensions/browser/extension_prefs.cc -@@ -2273,7 +2273,7 @@ void ExtensionPrefs::RegisterProfilePrefs( +@@ -2210,7 +2210,7 @@ void ExtensionPrefs::RegisterProfilePrefs( registry->RegisterDictionaryPref(kInstallSignature); registry->RegisterListPref(kExternalUninstalls); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-extensions_browser_pref__names.cc b/www/iridium/files/patch-extensions_browser_pref__names.cc index eb2b035e92d9..24b4c4df1d9c 100644 --- a/www/iridium/files/patch-extensions_browser_pref__names.cc +++ b/www/iridium/files/patch-extensions_browser_pref__names.cc @@ -1,6 +1,6 @@ ---- extensions/browser/pref_names.cc.orig 2023-01-17 19:19:00 UTC +--- extensions/browser/pref_names.cc.orig 2023-03-13 07:33:08 UTC +++ extensions/browser/pref_names.cc -@@ -48,7 +48,7 @@ const char kStorageGarbageCollect[] = "extensions.stor +@@ -49,7 +49,7 @@ const char kStorageGarbageCollect[] = "extensions.stor const char kDeletedComponentExtensions[] = "extensions.deleted_component_extensions"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-extensions_browser_pref__names.h b/www/iridium/files/patch-extensions_browser_pref__names.h index e28caa249a1d..14d01a51357d 100644 --- a/www/iridium/files/patch-extensions_browser_pref__names.h +++ b/www/iridium/files/patch-extensions_browser_pref__names.h @@ -1,6 +1,6 @@ ---- extensions/browser/pref_names.h.orig 2022-10-05 07:34:01 UTC +--- extensions/browser/pref_names.h.orig 2023-03-13 07:33:08 UTC +++ extensions/browser/pref_names.h -@@ -98,7 +98,7 @@ extern const char kStorageGarbageCollect[]; +@@ -103,7 +103,7 @@ extern const char kStorageGarbageCollect[]; extern const char kDeletedComponentExtensions[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 a8d8d57209cf..524eb387d0b3 100644 --- a/www/iridium/files/patch-extensions_common_api___permission__features.json +++ b/www/iridium/files/patch-extensions_common_api___permission__features.json @@ -1,4 +1,4 @@ ---- extensions/common/api/_permission_features.json.orig 2023-01-17 19:19:00 UTC +--- extensions/common/api/_permission_features.json.orig 2023-03-13 07:33:08 UTC +++ extensions/common/api/_permission_features.json @@ -134,7 +134,7 @@ { @@ -9,7 +9,7 @@ "allowlist": [ "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169 "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169 -@@ -429,7 +429,7 @@ +@@ -427,7 +427,7 @@ }, { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], @@ -18,7 +18,7 @@ "allowlist": [ "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 -@@ -471,7 +471,7 @@ +@@ -469,7 +469,7 @@ "networkingPrivate": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], diff --git a/www/iridium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc b/www/iridium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc index 77557e265ecc..fe295baf5ae6 100644 --- a/www/iridium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc +++ b/www/iridium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc @@ -1,6 +1,6 @@ ---- google_apis/gcm/engine/heartbeat_manager.cc.orig 2022-04-01 07:48:30 UTC +--- google_apis/gcm/engine/heartbeat_manager.cc.orig 2023-03-13 07:33:08 UTC +++ google_apis/gcm/engine/heartbeat_manager.cc -@@ -32,7 +32,7 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30; +@@ -33,7 +33,7 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30; // Minimum time spent sleeping before we force a new heartbeat. const int kMinSuspendTimeMs = 1000 * 10; // 10 seconds. @@ -9,7 +9,7 @@ // The period at which to check if the heartbeat time has passed. Used to // protect against platforms where the timer is delayed by the system being // suspended. Only needed on linux because the other OSes provide a standard -@@ -192,7 +192,7 @@ void HeartbeatManager::RestartTimer() { +@@ -193,7 +193,7 @@ void HeartbeatManager::RestartTimer() { base::BindRepeating(&HeartbeatManager::OnHeartbeatTriggered, weak_ptr_factory_.GetWeakPtr())); @@ -18,7 +18,7 @@ // Windows, Mac, Android, iOS, and Chrome OS all provide a way to be notified // when the system is suspending or resuming. The only one that does not is // Linux so we need to poll to check for missed heartbeats. -@@ -217,7 +217,7 @@ void HeartbeatManager::CheckForMissedHeartbeat() { +@@ -218,7 +218,7 @@ void HeartbeatManager::CheckForMissedHeartbeat() { return; } diff --git a/www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc index ca9412e08229..00fd33f61ef4 100644 --- a/www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc +++ b/www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2023-01-17 19:19:00 UTC +--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2023-03-13 07:33:08 UTC +++ gpu/command_buffer/common/gpu_memory_buffer_support.cc @@ -173,7 +173,7 @@ uint32_t GetPlatformSpecificTextureTarget() { #if BUILDFLAG(IS_MAC) @@ -8,8 +8,8 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) return GL_TEXTURE_EXTERNAL_OES; #elif BUILDFLAG(IS_FUCHSIA) - return GL_TEXTURE_2D; -@@ -205,7 +205,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu + // Fuchsia uses Vulkan. +@@ -206,7 +206,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu gfx::BufferFormat format, gfx::BufferPlane plane) { #if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc index d278fc884fbb..bbdc3ca7fff5 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2022-12-06 08:09:13 UTC +--- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2023-03-13 07:33:08 UTC +++ gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc -@@ -94,7 +94,7 @@ bool AngleVulkanImageBackingFactory::CanUseAngleVulkan +@@ -122,7 +122,7 @@ bool AngleVulkanImageBackingFactory::CanUseAngleVulkan // TODO(penghuang): verify the scanout is the right usage for video playback. // crbug.com/1280798 constexpr auto kSupportedUsages = diff --git a/www/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 27c3d14c629d..193a27592275 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,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-01-17 19:19:00 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-03-13 07:33:08 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc -@@ -32,7 +32,7 @@ +@@ -34,7 +34,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/scoped_binders.h" @@ -9,12 +9,12 @@ #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" #endif -@@ -572,7 +572,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma - MemoryTypeTracker* tracker, +@@ -582,7 +582,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma WGPUDevice wgpuDevice, - WGPUBackendType backend_type) { + WGPUBackendType backend_type, + std::vector<WGPUTextureFormat> view_formats) { -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(USE_DAWN) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) - auto wgpu_format = viz::ToWGPUFormat(format()); + auto wgpu_format = ToWGPUFormat(format()); if (wgpu_format == WGPUTextureFormat_Undefined) { diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc new file mode 100644 index 000000000000..24a42156e956 --- /dev/null +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc @@ -0,0 +1,11 @@ +--- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-03-13 07:33:08 UTC ++++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc +@@ -172,7 +172,7 @@ bool ExternalVkImageBackingFactory::IsSupported( + + // TODO: remove it when below formats are converted to multi plane shared + // image formats. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + switch (format.resource_format()) { + case viz::YUV_420_BIPLANAR: + case viz::YUVA_420_TRIPLANAR: diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc deleted file mode 100644 index 5d77829d7ccf..000000000000 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc.orig 2023-01-17 19:19:00 UTC -+++ gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc -@@ -346,7 +346,7 @@ void GLTextureImageBacking::InitializeGLTexture( - } - - void GLTextureImageBacking::CreateEGLImage() { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) - SharedContextState* shared_context_state = factory()->GetSharedContextState(); - ui::ScopedMakeCurrent smc(shared_context_state->context(), - shared_context_state->surface()); diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc deleted file mode 100644 index 89cc29a57810..000000000000 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc.orig 2023-01-17 19:19:00 UTC -+++ gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc -@@ -165,7 +165,7 @@ bool GLTextureImageBackingFactory::IsSupported( - // Linux and ChromeOS support WebGPU/Compat on GL. All other platforms - // do not support WebGPU on GL. - if (usage & SHARED_IMAGE_USAGE_WEBGPU) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) - if (use_webgpu_adapter_ != WebGPUAdapterName::kCompat) { - return false; - } diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc new file mode 100644 index 000000000000..6a220d972fa3 --- /dev/null +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc @@ -0,0 +1,11 @@ +--- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2023-03-13 07:33:08 UTC ++++ gpu/command_buffer/service/shared_image/shared_image_manager.cc +@@ -472,7 +472,7 @@ bool SharedImageManager::SupportsScanoutImages() { + return true; + #elif BUILDFLAG(IS_ANDROID) + return base::AndroidHardwareBufferCompat::IsSupportAvailable(); +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + return ui::OzonePlatform::GetInstance() + ->GetPlatformRuntimeProperties() + .supports_native_pixmaps; diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc new file mode 100644 index 000000000000..578d05c8eeb7 --- /dev/null +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc @@ -0,0 +1,11 @@ +--- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig 2023-03-13 07:33:08 UTC ++++ gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc +@@ -186,7 +186,7 @@ bool WrappedSkImageBacking::Initialize() { + : GrMipMapped::kNo; + const std::string label = "WrappedSkImageBackingFactory_Initialize" + + CreateLabelForSharedImageUsage(usage()); +-#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) ++#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + // Initializing to bright green makes it obvious if the pixels are not + // properly set before they are displayed (e.g. https://crbug.com/956555). + // We don't do this on release builds because there is a slight overhead. diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc deleted file mode 100644 index 88458a02032b..000000000000 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc.orig 2023-01-17 19:19:00 UTC -+++ gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc -@@ -237,7 +237,7 @@ class WrappedSkImage : public ClearTrackingSharedImage - : GrMipMapped::kNo; - const std::string label = "WrappedSkImageBackingFactory_Initialize" + - CreateLabelForSharedImageUsage(usage()); --#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) -+#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - // Initializing to bright green makes it obvious if the pixels are not - // properly set before they are displayed (e.g. https://crbug.com/956555). - // We don't do this on release builds because there is a slight overhead. 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 280901c26b44..e945ee2eb4c7 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 2023-01-17 19:19:00 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-03-13 07:33:08 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1213,7 +1213,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1237,7 +1237,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( if (gr_context_type_ != GrContextType::kVulkan && use_webgpu_adapter_ != WebGPUAdapterName::kCompat) { diff --git a/www/iridium/files/patch-gpu_command__buffer_tests_gl__oes__egl__image__unittest.cc b/www/iridium/files/patch-gpu_command__buffer_tests_gl__oes__egl__image__unittest.cc index 1e6708ecd4ff..278a0caa5528 100644 --- a/www/iridium/files/patch-gpu_command__buffer_tests_gl__oes__egl__image__unittest.cc +++ b/www/iridium/files/patch-gpu_command__buffer_tests_gl__oes__egl__image__unittest.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/tests/gl_oes_egl_image_unittest.cc.orig 2022-04-01 07:48:30 UTC +--- gpu/command_buffer/tests/gl_oes_egl_image_unittest.cc.orig 2023-03-13 07:33:08 UTC +++ gpu/command_buffer/tests/gl_oes_egl_image_unittest.cc @@ -14,7 +14,7 @@ #include "ui/gl/gl_image.h" @@ -9,7 +9,7 @@ #include "ui/gl/gl_image_native_pixmap.h" #endif -@@ -43,7 +43,7 @@ class GpuOESEGLImageTest : public testing::Test, +@@ -46,7 +46,7 @@ class GpuOESEGLImageTest : public testing::Test, bool egl_initialized_{false}; }; diff --git a/www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc b/www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc index b74e1ea77372..02614cb1c762 100644 --- a/www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc +++ b/www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/tests/gl_test_utils.cc.orig 2022-10-05 07:34:01 UTC +--- gpu/command_buffer/tests/gl_test_utils.cc.orig 2023-03-13 07:33:08 UTC +++ gpu/command_buffer/tests/gl_test_utils.cc @@ -24,7 +24,7 @@ #include "ui/gl/gl_version_info.h" @@ -9,7 +9,7 @@ #include "ui/gl/gl_image_native_pixmap.h" #endif -@@ -458,7 +458,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { +@@ -459,7 +459,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { window_system_binding_info_ = gl::GLWindowSystemBindingInfo(); } 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 fffd520546f9..92933b670699 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 2022-12-06 08:09:13 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2023-03-13 07:33:08 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -351,7 +351,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -353,7 +353,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 -@@ -387,7 +387,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -389,7 +389,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. -@@ -436,7 +436,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -438,7 +438,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL if (gl_initialized && gl_use_swiftshader_ && !gl::IsSoftwareGLImplementation(gl::GetGLImplementationParts())) { @@ -27,7 +27,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -487,7 +487,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -489,7 +489,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } @@ -36,7 +36,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 -@@ -547,7 +547,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -549,7 +549,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -45,7 +45,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -675,7 +675,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -677,7 +677,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -54,7 +54,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. -@@ -727,7 +727,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -729,7 +729,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL gl_use_swiftshader_ = true; } } @@ -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 -@@ -869,7 +869,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -873,7 +873,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled; @@ -72,7 +72,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 -@@ -932,7 +932,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -937,7 +937,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); diff --git a/www/iridium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc b/www/iridium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc index 3671f6ee277c..14b5d0f0a082 100644 --- a/www/iridium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc +++ b/www/iridium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2022-03-28 18:11:04 UTC +--- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2023-03-13 07:33:08 UTC +++ gpu/ipc/service/gpu_memory_buffer_factory.cc -@@ -12,7 +12,7 @@ +@@ -13,7 +13,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h" #endif @@ -9,7 +9,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h" #endif -@@ -34,7 +34,7 @@ GpuMemoryBufferFactory::CreateNativeType( +@@ -36,7 +36,7 @@ GpuMemoryBufferFactory::CreateNativeType( return std::make_unique<GpuMemoryBufferFactoryIOSurface>(); #elif BUILDFLAG(IS_ANDROID) return std::make_unique<GpuMemoryBufferFactoryAndroidHardwareBuffer>(); diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__image.cc b/www/iridium/files/patch-gpu_vulkan_vulkan__image.cc index 8fe66d139521..2c416a7d31ad 100644 --- a/www/iridium/files/patch-gpu_vulkan_vulkan__image.cc +++ b/www/iridium/files/patch-gpu_vulkan_vulkan__image.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_image.cc.orig 2022-03-28 18:11:04 UTC +--- gpu/vulkan/vulkan_image.cc.orig 2023-03-13 07:33:08 UTC +++ gpu/vulkan/vulkan_image.cc -@@ -322,7 +322,7 @@ bool VulkanImage::InitializeWithExternalMemory( +@@ -392,7 +392,7 @@ bool VulkanImage::InitializeWithExternalMemory( // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__image.h b/www/iridium/files/patch-gpu_vulkan_vulkan__image.h index 4424307a4505..910287117bb1 100644 --- a/www/iridium/files/patch-gpu_vulkan_vulkan__image.h +++ b/www/iridium/files/patch-gpu_vulkan_vulkan__image.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_image.h.orig 2022-03-28 18:11:04 UTC +--- gpu/vulkan/vulkan_image.h.orig 2023-03-13 07:33:08 UTC +++ gpu/vulkan/vulkan_image.h -@@ -86,7 +86,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { +@@ -87,7 +87,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { VkImageUsageFlags usage, VkImageCreateFlags flags); @@ -9,7 +9,7 @@ static std::unique_ptr<VulkanImage> CreateWithExternalMemoryAndModifiers( VulkanDeviceQueue* device_queue, const gfx::Size& size, -@@ -170,7 +170,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { +@@ -199,7 +199,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { VkImageTiling image_tiling, uint32_t queue_family_index); 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 2fba1c59e5b0..503869e2f4b7 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 2022-12-01 10:35:46 UTC +--- headless/lib/browser/headless_web_contents_impl.cc.orig 2023-03-13 07:33:08 UTC +++ headless/lib/browser/headless_web_contents_impl.cc -@@ -60,7 +60,7 @@ namespace headless { +@@ -61,7 +61,7 @@ namespace headless { namespace { void UpdatePrefsFromSystemSettings(blink::RendererPreferences* prefs) { diff --git a/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc index 77a407bedcf3..a72a31efd5f8 100644 --- a/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc +++ b/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc @@ -1,9 +1,9 @@ ---- headless/lib/headless_content_main_delegate.cc.orig 2022-12-06 08:09:13 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2023-03-13 07:33:08 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -336,7 +336,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( - if (process_type != switches::kZygoteProcess) { +@@ -326,7 +326,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( + if (process_type != ::switches::kZygoteProcess) { g_headless_crash_client.Pointer()->set_crash_dumps_dir( - options()->crash_dumps_dir); + command_line.GetSwitchValuePath(switches::kCrashDumpsDir)); -#if !BUILDFLAG(IS_WIN) +#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD) crash_reporter::InitializeCrashpad(process_type.empty(), process_type); diff --git a/www/iridium/files/patch-ipc_ipc__channel.h b/www/iridium/files/patch-ipc_ipc__channel.h index f1ae067a56dc..75c2def84f6d 100644 --- a/www/iridium/files/patch-ipc_ipc__channel.h +++ b/www/iridium/files/patch-ipc_ipc__channel.h @@ -1,6 +1,6 @@ ---- ipc/ipc_channel.h.orig 2022-10-05 07:34:01 UTC +--- ipc/ipc_channel.h.orig 2023-03-13 07:33:08 UTC +++ ipc/ipc_channel.h -@@ -234,7 +234,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { +@@ -233,7 +233,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { static std::string GenerateUniqueRandomChannelID(); #endif diff --git a/www/iridium/files/patch-ipc_ipc__channel__common.cc b/www/iridium/files/patch-ipc_ipc__channel__common.cc index cb5863b98198..9c887f40ede3 100644 --- a/www/iridium/files/patch-ipc_ipc__channel__common.cc +++ b/www/iridium/files/patch-ipc_ipc__channel__common.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_channel_common.cc.orig 2022-10-05 07:34:01 UTC +--- ipc/ipc_channel_common.cc.orig 2023-03-13 07:33:08 UTC +++ ipc/ipc_channel_common.cc -@@ -11,7 +11,7 @@ +@@ -10,7 +10,7 @@ namespace IPC { diff --git a/www/iridium/files/patch-ipc_ipc__channel__mojo.cc b/www/iridium/files/patch-ipc_ipc__channel__mojo.cc index 301235ac4f11..9e646b1bae54 100644 --- a/www/iridium/files/patch-ipc_ipc__channel__mojo.cc +++ b/www/iridium/files/patch-ipc_ipc__channel__mojo.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_channel_mojo.cc.orig 2023-01-17 19:19:00 UTC +--- ipc/ipc_channel_mojo.cc.orig 2023-03-13 07:33:08 UTC +++ ipc/ipc_channel_mojo.cc -@@ -113,7 +113,7 @@ class ThreadSafeChannelProxy : public mojo::ThreadSafe +@@ -105,7 +105,7 @@ class ThreadSafeChannelProxy : public mojo::ThreadSafe }; base::ProcessId GetSelfPID() { diff --git a/www/iridium/files/patch-media_BUILD.gn b/www/iridium/files/patch-media_BUILD.gn index 58b78b1ec638..d2f93e4ef0d9 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 2023-01-17 19:19:00 UTC +--- media/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ media/BUILD.gn -@@ -82,6 +82,9 @@ config("media_config") { +@@ -81,6 +81,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 6d9f003639f9..440421029f4a 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 2023-01-17 19:19:00 UTC +--- media/audio/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ media/audio/BUILD.gn -@@ -248,9 +248,20 @@ source_set("audio") { +@@ -246,9 +246,20 @@ source_set("audio") { ] } diff --git a/www/iridium/files/patch-media_audio_audio__output__proxy__unittest.cc b/www/iridium/files/patch-media_audio_audio__output__proxy__unittest.cc index 53bd0c63c353..fb80a0ad5023 100644 --- a/www/iridium/files/patch-media_audio_audio__output__proxy__unittest.cc +++ b/www/iridium/files/patch-media_audio_audio__output__proxy__unittest.cc @@ -1,6 +1,6 @@ ---- media/audio/audio_output_proxy_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- media/audio/audio_output_proxy_unittest.cc.orig 2023-03-13 07:33:08 UTC +++ media/audio/audio_output_proxy_unittest.cc -@@ -412,7 +412,11 @@ class AudioOutputProxyTest : public testing::Test { +@@ -443,7 +443,11 @@ class AudioOutputProxyTest : public testing::Test { // |stream| is closed at this point. Start() should reopen it again. EXPECT_CALL(manager(), MakeAudioOutputStream(_, _, _)) .Times(2) diff --git a/www/iridium/files/patch-media_audio_sndio_sndio__input.cc b/www/iridium/files/patch-media_audio_sndio_sndio__input.cc index 3772de6e2ac2..3cae690b0c41 100644 --- a/www/iridium/files/patch-media_audio_sndio_sndio__input.cc +++ b/www/iridium/files/patch-media_audio_sndio_sndio__input.cc @@ -1,11 +1,10 @@ ---- media/audio/sndio/sndio_input.cc.orig 2022-03-28 18:11:04 UTC +--- media/audio/sndio/sndio_input.cc.orig 2023-03-13 07:33:08 UTC +++ media/audio/sndio/sndio_input.cc -@@ -0,0 +1,201 @@ +@@ -0,0 +1,200 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + -+#include "base/bind.h" +#include "base/logging.h" +#include "media/base/audio_timestamp_helper.h" +#include "media/audio/sndio/audio_manager_sndio.h" diff --git a/www/iridium/files/patch-media_audio_sndio_sndio__output.cc b/www/iridium/files/patch-media_audio_sndio_sndio__output.cc index e0500fb8fbcb..0111100cd59d 100644 --- a/www/iridium/files/patch-media_audio_sndio_sndio__output.cc +++ b/www/iridium/files/patch-media_audio_sndio_sndio__output.cc @@ -1,4 +1,4 @@ ---- media/audio/sndio/sndio_output.cc.orig 2022-03-28 18:11:04 UTC +--- media/audio/sndio/sndio_output.cc.orig 2023-03-13 07:33:08 UTC +++ media/audio/sndio/sndio_output.cc @@ -0,0 +1,187 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. @@ -165,7 +165,7 @@ + // Get data to play + const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, + params.sample_rate()); -+ count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get()); ++ count = source->OnMoreData(delay, base::TimeTicks::Now(), {}, audio_bus.get()); + audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer)); + if (count == 0) { + // We have to submit something to the device diff --git a/www/iridium/files/patch-media_base_media__switches.cc b/www/iridium/files/patch-media_base_media__switches.cc index 5ff9c6f4dde3..da715ff70301 100644 --- a/www/iridium/files/patch-media_base_media__switches.cc +++ b/www/iridium/files/patch-media_base_media__switches.cc @@ -1,4 +1,4 @@ ---- media/base/media_switches.cc.orig 2023-01-17 19:19:00 UTC +--- media/base/media_switches.cc.orig 2023-03-13 07:33:08 UTC +++ media/base/media_switches.cc @@ -12,7 +12,7 @@ #include "components/system_media_controls/linux/buildflags/buildflags.h" @@ -9,7 +9,7 @@ #include "base/cpu.h" #endif -@@ -494,7 +494,7 @@ BASE_FEATURE(kGav1VideoDecoder, +@@ -584,7 +584,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -535,7 +535,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP +@@ -637,7 +637,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -579,7 +579,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -681,7 +681,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -36,9 +36,9 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. BASE_FEATURE(kVaapiVideoDecodeLinux, -@@ -1084,14 +1084,14 @@ const base::Feature MEDIA_EXPORT kDeprecateLowUsageCod - "DeprecateLowUsageCodecs", base::FEATURE_ENABLED_BY_DEFAULT}; - #endif // BUILDFLAG(IS_CHROMEOS) +@@ -1179,14 +1179,14 @@ BASE_FEATURE(kAllowClearDolbyVisionInMseWhenPlatformEn + base::FEATURE_DISABLED_BY_DEFAULT); + #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-media_base_media__switches.h b/www/iridium/files/patch-media_base_media__switches.h index 38bb4c178e9b..579a259aa8e0 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 2023-01-17 19:19:00 UTC +--- media/base/media_switches.h.orig 2023-03-13 07:33:08 UTC +++ media/base/media_switches.h -@@ -217,7 +217,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor +@@ -271,7 +271,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseMediaHistoryStore); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseR16Texture); @@ -9,8 +9,8 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux); -@@ -328,11 +328,11 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE( - MEDIA_EXPORT BASE_DECLARE_FEATURE(kDeprecateLowUsageCodecs); +@@ -388,11 +388,11 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE( + kAllowClearDolbyVisionInMseWhenPlatformEncryptedDvEnabled); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-media_base_supported__types.cc b/www/iridium/files/patch-media_base_supported__types.cc index 1135811b4e3a..d59c6da33010 100644 --- a/www/iridium/files/patch-media_base_supported__types.cc +++ b/www/iridium/files/patch-media_base_supported__types.cc @@ -1,6 +1,6 @@ ---- media/base/supported_types.cc.orig 2022-12-01 10:35:46 UTC +--- media/base/supported_types.cc.orig 2023-03-13 07:33:08 UTC +++ media/base/supported_types.cc -@@ -206,7 +206,7 @@ bool IsHevcProfileSupported(const VideoType& type) { +@@ -209,7 +209,7 @@ bool IsHevcProfileSupported(const VideoType& type) { #if BUILDFLAG(ENABLE_PLATFORM_HEVC) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ 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 index ce8a5a9bc74d..ce4f835d430a 100644 --- a/www/iridium/files/patch-media_base_user__input__monitor__unittest.cc +++ b/www/iridium/files/patch-media_base_user__input__monitor__unittest.cc @@ -1,4 +1,4 @@ ---- media/base/user_input_monitor_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- 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" @@ -18,7 +18,7 @@ base::test::TaskEnvironment task_environment( base::test::TaskEnvironment::MainThreadType::IO); #else -@@ -71,7 +71,7 @@ TEST_F(UserInputMonitorTest, CreatePlatformSpecific) { +@@ -72,7 +72,7 @@ TEST_F(UserInputMonitorTest, CreatePlatformSpecific) { } TEST_F(UserInputMonitorTest, CreatePlatformSpecificWithMapping) { diff --git a/www/iridium/files/patch-media_base_video__frame.cc b/www/iridium/files/patch-media_base_video__frame.cc index 7b703261155c..85dcb7091806 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 2023-01-17 19:19:00 UTC +--- media/base/video_frame.cc.orig 2023-03-13 07:33:08 UTC +++ media/base/video_frame.cc -@@ -79,7 +79,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -80,7 +80,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 -@@ -94,7 +94,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -95,7 +95,7 @@ std::string VideoFrame::StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return @@ -18,7 +18,7 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -306,7 +306,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo +@@ -307,7 +307,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); } @@ -27,7 +27,7 @@ // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and // thus to have several VideoFrames share the same set of DMABUF FDs. class VideoFrame::DmabufHolder -@@ -646,7 +646,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -647,7 +647,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM for (size_t i = 0; i < num_planes; ++i) planes[i].stride = gpu_memory_buffer->stride(i); uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; @@ -36,7 +36,7 @@ if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { const auto gmb_handle = gpu_memory_buffer->CloneHandle(); if (gmb_handle.is_null() || -@@ -692,7 +692,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -693,7 +693,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -45,7 +45,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -910,7 +910,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -913,7 +913,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( } } @@ -54,7 +54,7 @@ DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1301,7 +1301,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( +@@ -1304,7 +1304,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( : mailbox_holders_[texture_index]; } @@ -63,7 +63,7 @@ const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1413,7 +1413,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1417,7 +1417,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, storage_type_(storage_type), visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), natural_size_(natural_size), diff --git a/www/iridium/files/patch-media_capture_video_create__video__capture__device__factory.cc b/www/iridium/files/patch-media_capture_video_create__video__capture__device__factory.cc index 5e6cbe7bb1c5..53e3f4605c22 100644 --- a/www/iridium/files/patch-media_capture_video_create__video__capture__device__factory.cc +++ b/www/iridium/files/patch-media_capture_video_create__video__capture__device__factory.cc @@ -1,6 +1,6 @@ ---- media/capture/video/create_video_capture_device_factory.cc.orig 2022-03-28 18:11:04 UTC +--- media/capture/video/create_video_capture_device_factory.cc.orig 2023-03-13 07:33:08 UTC +++ media/capture/video/create_video_capture_device_factory.cc -@@ -12,7 +12,7 @@ +@@ -13,7 +13,7 @@ #include "media/capture/video/fake_video_capture_device_factory.h" #include "media/capture/video/file_video_capture_device_factory.h" @@ -9,7 +9,7 @@ #include "media/capture/video/linux/video_capture_device_factory_linux.h" #elif BUILDFLAG(IS_CHROMEOS_ASH) #include "media/capture/video/chromeos/public/cros_features.h" -@@ -55,7 +55,7 @@ CreateFakeVideoCaptureDeviceFactory() { +@@ -56,7 +56,7 @@ CreateFakeVideoCaptureDeviceFactory() { std::unique_ptr<VideoCaptureDeviceFactory> CreatePlatformSpecificVideoCaptureDeviceFactory( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { 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 0b229e09e9b2..4bd651b37cfa 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 2022-12-06 08:09:13 UTC +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2023-03-13 07:33:08 UTC +++ media/capture/video/linux/v4l2_capture_delegate.cc @@ -4,8 +4,10 @@ @@ -11,7 +11,7 @@ #include <poll.h> #include <sys/fcntl.h> #include <sys/ioctl.h> -@@ -28,10 +30,10 @@ +@@ -29,10 +31,10 @@ using media::mojom::MeteringMode; @@ -24,7 +24,7 @@ // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the // format is introduced to kernel. -@@ -667,7 +669,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate +@@ -668,7 +670,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate V4L2CaptureDelegate::~V4L2CaptureDelegate() = default; @@ -33,7 +33,7 @@ int num_retries = 0; for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries; ++num_retries) { -@@ -677,7 +679,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* +@@ -678,7 +680,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* return num_retries != kMaxIOCtrlRetries; } 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 95540f7ac9c2..9817d8ceb6a4 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 2022-10-05 07:34:01 UTC +--- media/capture/video/linux/v4l2_capture_delegate.h.orig 2023-03-13 07:33:08 UTC +++ media/capture/video/linux/v4l2_capture_delegate.h -@@ -86,10 +86,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { +@@ -87,10 +87,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { // device file descriptor or (re)starting streaming, can fail but works after // retrying (https://crbug.com/670262). Returns false if the |request| ioctl // fails too many times. diff --git a/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc b/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc index 233cb99feb62..efd9202f6a2d 100644 --- a/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc +++ b/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc @@ -1,6 +1,6 @@ ---- media/capture/video/linux/video_capture_device_factory_linux.cc.orig 2022-03-28 18:11:04 UTC +--- media/capture/video/linux/video_capture_device_factory_linux.cc.orig 2023-03-13 07:33:08 UTC +++ media/capture/video/linux/video_capture_device_factory_linux.cc -@@ -72,6 +72,9 @@ class DevVideoFilePathsDeviceProvider +@@ -73,6 +73,9 @@ class DevVideoFilePathsDeviceProvider : public VideoCaptureDeviceFactoryLinux::DeviceProvider { public: void GetDeviceIds(std::vector<std::string>* target_container) override { @@ -10,7 +10,7 @@ const base::FilePath path("/dev/"); base::FileEnumerator enumerator(path, false, base::FileEnumerator::FILES, "video*"); -@@ -79,9 +82,13 @@ class DevVideoFilePathsDeviceProvider +@@ -80,9 +83,13 @@ class DevVideoFilePathsDeviceProvider const base::FileEnumerator::FileInfo info = enumerator.GetInfo(); target_container->emplace_back(path.value() + info.GetName().value()); } @@ -24,7 +24,7 @@ const std::string file_name = ExtractFileNameFromDeviceId(device_id); std::string usb_id; const std::string vid_path = -@@ -99,6 +106,9 @@ class DevVideoFilePathsDeviceProvider +@@ -100,6 +107,9 @@ class DevVideoFilePathsDeviceProvider } std::string GetDeviceDisplayName(const std::string& device_id) override { @@ -34,7 +34,7 @@ const std::string file_name = ExtractFileNameFromDeviceId(device_id); const std::string interface_path = base::StringPrintf(kInterfacePathTemplate, file_name.c_str()); -@@ -213,7 +223,7 @@ void VideoCaptureDeviceFactoryLinux::GetDevicesInfo( +@@ -214,7 +224,7 @@ void VideoCaptureDeviceFactoryLinux::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 4668a23e1907..756829e079c9 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 2022-10-05 07:34:01 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2023-03-13 07:33:08 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -317,7 +317,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( +@@ -318,7 +318,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. // Windows RGB24 defines blue at lowest byte, // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 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 b361c8b74ff6..58833daa0b7e 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,15 +1,32 @@ ---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-01-17 19:19:00 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-03-13 07:33:08 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -768,7 +768,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -213,7 +213,7 @@ std::unique_ptr<VideoDecoder> VideoDecoderPipeline::Cr + #if BUILDFLAG(USE_VAAPI) + create_decoder_function_cb = base::BindOnce(&VaapiVideoDecoder::Create); + #elif BUILDFLAG(USE_V4L2_CODEC) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) + create_decoder_function_cb = base::BindOnce(&V4L2VideoDecoder::Create); + #else + return nullptr; +@@ -807,14 +807,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } } --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_VAAPI) ++#if (BUILDFLAG(IS_BSD) || BUILDFLAG(IS_LINUX)) && BUILDFLAG(USE_VAAPI) // Linux should always use a custom allocator (to allocate buffers using // libva) and a PlatformVideoFramePool. CHECK(allocator.has_value()); -@@ -790,7 +790,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( + CHECK(main_frame_pool_->AsPlatformVideoFramePool()); + main_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator( + *allocator); +-#elif BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_V4L2_CODEC) ++#elif (BUILDFLAG(IS_BSD) || BUILDFLAG(IS_LINUX)) && BUILDFLAG(USE_V4L2_CODEC) + // Linux w/ V4L2 should not use a custom allocator + // Only tested with video_decode_accelerator_tests + // TODO(wenst@) Test with full Chromium Browser +@@ -842,7 +842,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( #error "Unsupported platform" #endif diff --git a/www/iridium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc b/www/iridium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc index 937a549e4ad3..d366f41da4f9 100644 --- a/www/iridium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc +++ b/www/iridium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc @@ -1,6 +1,6 @@ ---- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2022-10-05 07:34:01 UTC +--- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2023-03-13 07:33:08 UTC +++ media/gpu/gpu_video_encode_accelerator_factory.cc -@@ -111,7 +111,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions +@@ -121,7 +121,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions return vea_factory_functions; #if BUILDFLAG(USE_VAAPI) diff --git a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc index 5047a171b03f..040dd117c0f5 100644 --- a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc +++ b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc @@ -1,6 +1,6 @@ ---- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2022-12-01 10:35:46 UTC +--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2023-03-13 07:33:08 UTC +++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc -@@ -14,12 +14,15 @@ +@@ -15,7 +15,9 @@ #include "media/gpu/vaapi/vaapi_wrapper.h" #endif @@ -8,19 +8,37 @@ using sandbox::syscall_broker::BrokerFilePermission; +#endif + // TODO(b/195769334): the hardware video decoding sandbox is really only useful + // when building with VA-API or V4L2 (otherwise, we're not really doing hardware +@@ -31,6 +33,7 @@ using sandbox::syscall_broker::BrokerFilePermission; namespace media { + namespace { ++#if !BUILDFLAG(IS_BSD) + void AllowAccessToRenderNodes(std::vector<BrokerFilePermission>& permissions, + bool include_sys_dev_char, + bool read_write) { +@@ -160,6 +163,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( + return false; + #endif // BUILDFLAG(USE_V4L2_CODEC) + } ++#endif + + } // namespace + +@@ -175,6 +179,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( + // (at least). bool HardwareVideoDecodingPreSandboxHook( sandbox::policy::SandboxLinux::Options options) { +#if !BUILDFLAG(IS_BSD) - sandbox::syscall_broker::BrokerCommandSet command_set; - std::vector<BrokerFilePermission> permissions; - -@@ -126,6 +129,7 @@ bool HardwareVideoDecodingPreSandboxHook( - dlopen("/usr/lib/libv4l2.so", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE); - #endif // defined(__aarch64__) - #endif // BUILDFLAG(USE_VAAPI) + using HardwareVideoDecodingProcessPolicy = + sandbox::policy::HardwareVideoDecodingProcessPolicy; + using PolicyType = +@@ -212,6 +217,7 @@ bool HardwareVideoDecodingPreSandboxHook( + sandbox::policy::SandboxLinux::GetInstance()->StartBrokerProcess( + command_set, permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), + options); +#endif - return true; } + 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 8c350ff6beb2..aea7f0f7ace1 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 2022-10-05 07:34:01 UTC +--- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2023-03-13 07:33:08 UTC +++ media/gpu/vaapi/vaapi_video_decoder.cc -@@ -767,7 +767,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree +@@ -768,7 +768,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 0924ac7a29fe..ace03a49dda4 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 2023-01-17 19:19:00 UTC +--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2023-03-13 07:33:08 UTC +++ media/gpu/vaapi/vaapi_wrapper.cc -@@ -740,7 +740,7 @@ VADisplayState::VADisplayState() +@@ -755,7 +755,7 @@ VADisplayState::VADisplayState() bool VADisplayState::Initialize() { base::AutoLock auto_lock(va_lock_); diff --git a/www/iridium/files/patch-media_media__options.gni b/www/iridium/files/patch-media_media__options.gni index 97f33964ac12..73f0ab86ab85 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 2023-01-17 19:19:00 UTC +--- media/media_options.gni.orig 2023-03-13 07:33:08 UTC +++ media/media_options.gni -@@ -160,12 +160,15 @@ declare_args() { +@@ -172,12 +172,15 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false @@ -17,7 +17,7 @@ (!is_castos || (target_cpu == "x86" || target_cpu == "x64") || is_cast_audio_only)) { use_alsa = true -@@ -181,6 +184,10 @@ declare_args() { +@@ -193,6 +196,10 @@ declare_args() { if (!use_cras && !is_castos && !is_asan && !is_tsan) { use_pulseaudio = true } 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 c1c2051965e9..740ff61dec53 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,4 +1,4 @@ ---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2022-12-06 08:09:13 UTC +--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2023-03-13 07:33:08 UTC +++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc @@ -42,7 +42,7 @@ media::stable::mojom::VideoFrameDataPtr MakeVideoFrame gfx::GpuMemoryBufferHandle gpu_memory_buffer_handle = @@ -9,7 +9,7 @@ CHECK_EQ(gpu_memory_buffer_handle.type, gfx::NATIVE_PIXMAP); CHECK(!gpu_memory_buffer_handle.native_pixmap_handle.planes.empty()); #else -@@ -747,7 +747,7 @@ const gfx::GpuMemoryBufferId& StructTraits< +@@ -751,7 +751,7 @@ const gfx::GpuMemoryBufferId& StructTraits< return input.id; } @@ -18,7 +18,7 @@ // static gfx::NativePixmapHandle StructTraits< media::stable::mojom::NativeGpuMemoryBufferHandleDataView, -@@ -768,7 +768,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor +@@ -772,7 +772,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor output->type = gfx::NATIVE_PIXMAP; 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 f0931aaa0e16..8e8020e9628a 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 2023-01-17 19:19:00 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2023-03-13 07:33:08 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -735,7 +735,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -727,7 +727,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); @@ -9,7 +9,7 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1164,7 +1164,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1158,7 +1158,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo is_webgpu_compatible = (gpu_memory_buffer != nullptr); #endif @@ -18,7 +18,7 @@ is_webgpu_compatible = (gpu_memory_buffer != nullptr); if (is_webgpu_compatible) { is_webgpu_compatible &= -@@ -1183,7 +1183,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1177,7 +1177,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | gpu::SHARED_IMAGE_USAGE_SCANOUT; 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 db60aace997a..d889e9a657b6 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 2023-01-17 19:19:00 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2023-03-13 07:33:08 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -135,7 +135,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( +@@ -141,7 +141,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( if (is_rgb) config.input_format = PIXEL_FORMAT_I420; @@ -9,9 +9,9 @@ if (format != PIXEL_FORMAT_I420 || !VideoFrame::IsStorageTypeMappable(storage_type)) { // ChromeOS/Linux hardware video encoders supports I420 on-memory -@@ -453,7 +453,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -464,7 +464,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal SetUpVeaConfig(profile_, options_, format, first_frame->storage_type(), - supported_rc_modes_); + supported_rc_modes_, required_encoder_type_); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) 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 05b97077ba46..909def1cb191 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 2023-01-17 19:19:00 UTC +--- media/video/video_encode_accelerator_adapter_test.cc.orig 2023-03-13 07:33:08 UTC +++ media/video/video_encode_accelerator_adapter_test.cc -@@ -444,7 +444,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes +@@ -449,7 +449,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 ba25c41cdbcf..5294b1a4358e 100644 --- a/www/iridium/files/patch-media_webrtc_audio__processor.cc +++ b/www/iridium/files/patch-media_webrtc_audio__processor.cc @@ -1,6 +1,6 @@ ---- media/webrtc/audio_processor.cc.orig 2023-01-17 19:19:00 UTC +--- media/webrtc/audio_processor.cc.orig 2023-03-13 07:33:08 UTC +++ media/webrtc/audio_processor.cc -@@ -488,7 +488,7 @@ absl::optional<double> AudioProcessor::ProcessData( +@@ -513,7 +513,7 @@ absl::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 13700baf6ece..82db463ad7d4 100644 --- a/www/iridium/files/patch-media_webrtc_helpers.cc +++ b/www/iridium/files/patch-media_webrtc_helpers.cc @@ -1,19 +1,11 @@ ---- media/webrtc/helpers.cc.orig 2023-01-17 19:19:00 UTC +--- media/webrtc/helpers.cc.orig 2023-03-13 07:33:08 UTC +++ media/webrtc/helpers.cc -@@ -17,14 +17,14 @@ - namespace media { - namespace { - +@@ -40,7 +40,7 @@ void ConfigAutomaticGainControl(const AudioProcessingS + apm_config.gain_controller2.enabled = false; + return; + } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - constexpr bool kUseHybridAgc = true; - #else - constexpr bool kUseHybridAgc = false; - #endif + // Use the Hybrid AGC setup, which combines the AGC1 input volume controller + // and the AGC2 digital adaptive controller. - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - constexpr bool kUseClippingController = true; - #else - constexpr bool kUseClippingController = false; diff --git a/www/iridium/files/patch-media_webrtc_helpers__unittests.cc b/www/iridium/files/patch-media_webrtc_helpers__unittests.cc index 837371ded334..afe0efa8d20d 100644 --- a/www/iridium/files/patch-media_webrtc_helpers__unittests.cc +++ b/www/iridium/files/patch-media_webrtc_helpers__unittests.cc @@ -1,20 +1,29 @@ ---- media/webrtc/helpers_unittests.cc.orig 2022-10-05 07:34:01 UTC +--- media/webrtc/helpers_unittests.cc.orig 2023-03-13 07:33:08 UTC +++ media/webrtc/helpers_unittests.cc -@@ -36,7 +36,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau +@@ -39,7 +39,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau EXPECT_FALSE(config.pre_amplifier.enabled); EXPECT_TRUE(config.echo_canceller.enabled); - EXPECT_TRUE(config.gain_controller1.enabled); + -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + EXPECT_TRUE(config.gain_controller1.enabled); EXPECT_TRUE(config.gain_controller2.enabled); - #else - EXPECT_FALSE(config.gain_controller2.enabled); -@@ -98,7 +98,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau + #elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) +@@ -77,7 +77,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, + EXPECT_EQ(config.gain_controller2, kDefaultApmConfig.gain_controller2); + } - // Check that either AGC1 digital or AGC2 digital is used based on the - // platforms where the Hybrid AGC is enabled by default. -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - EXPECT_FALSE(agc1_analog_config.enable_digital_adaptive); - EXPECT_TRUE(config.gain_controller2.enabled); - EXPECT_TRUE(config.gain_controller2.adaptive_digital.enabled); + TEST(CreateWebRtcAudioProcessingModuleTest, + InputVolumeAdjustmentEnabledWithHybridAgc) { + ::base::test::ScopedFeatureList feature_list; +@@ -103,7 +103,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + TEST(CreateWebRtcAudioProcessingModuleTest, + OnlyOneInputVolumeControllerEnabledOnDesktopPlatforms) { + auto config = CreateApmGetConfig( diff --git a/www/iridium/files/patch-mojo_core_BUILD.gn b/www/iridium/files/patch-mojo_core_BUILD.gn index 0f5a2612b8cc..f573a876be4d 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 2022-12-06 08:09:13 UTC +--- mojo/core/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ mojo/core/BUILD.gn -@@ -163,7 +163,7 @@ template("core_impl_source_set") { +@@ -164,7 +164,7 @@ template("core_impl_source_set") { ] } diff --git a/www/iridium/files/patch-mojo_core_channel.cc b/www/iridium/files/patch-mojo_core_channel.cc index bbd634e34580..8e4d3cc8f3ae 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 2022-12-01 10:35:46 UTC +--- mojo/core/channel.cc.orig 2023-03-13 07:33:08 UTC +++ mojo/core/channel.cc -@@ -72,7 +72,11 @@ const size_t kMaxUnusedReadBufferCapacity = 4096; +@@ -75,7 +75,11 @@ const size_t kMaxUnusedReadBufferCapacity = 4096; // Fuchsia: The zx_channel_write() API supports up to 64 handles. const size_t kMaxAttachedHandles = 64; diff --git a/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni index fb5320bf5060..91a4adb004a6 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 2023-01-17 19:19:00 UTC +--- mojo/public/tools/bindings/mojom.gni.orig 2023-03-13 07:33:08 UTC +++ mojo/public/tools/bindings/mojom.gni -@@ -699,6 +699,16 @@ template("mojom") { +@@ -703,6 +703,16 @@ template("mojom") { enabled_features += [ "is_win" ] } diff --git a/www/iridium/files/patch-net_BUILD.gn b/www/iridium/files/patch-net_BUILD.gn index 625b38ff0681..e8fcd9d0d924 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 2023-01-17 19:19:00 UTC +--- net/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ net/BUILD.gn @@ -103,7 +103,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1209,6 +1209,15 @@ component("net") { +@@ -1214,6 +1214,15 @@ component("net") { deps += [ "//third_party/xdg_shared_mime_info" ] } @@ -25,7 +25,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1341,7 +1350,7 @@ component("net") { +@@ -1346,7 +1355,7 @@ component("net") { } } @@ -34,7 +34,7 @@ sources += [ "base/network_change_notifier_posix.cc", "base/network_change_notifier_posix.h", -@@ -1374,7 +1383,7 @@ component("net") { +@@ -1379,7 +1388,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -43,8 +43,8 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -4642,7 +4651,7 @@ test("net_unittests") { - ] +@@ -4722,7 +4731,7 @@ test("net_unittests") { + sources += [ "proxy_resolution/proxy_config_service_linux_unittest.cc" ] } - if (is_linux || is_chromeos) { @@ -52,7 +52,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -4717,6 +4726,10 @@ test("net_unittests") { +@@ -4794,6 +4803,10 @@ test("net_unittests") { "//url:buildflags", ] @@ -63,7 +63,7 @@ if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -4784,7 +4797,7 @@ test("net_unittests") { +@@ -4861,7 +4874,7 @@ test("net_unittests") { ] } @@ -72,7 +72,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -4906,7 +4919,7 @@ test("net_unittests") { +@@ -4986,7 +4999,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/iridium/files/patch-net_base_network__change__notifier.cc b/www/iridium/files/patch-net_base_network__change__notifier.cc index bd400e5ec452..8ad5e75000fc 100644 --- a/www/iridium/files/patch-net_base_network__change__notifier.cc +++ b/www/iridium/files/patch-net_base_network__change__notifier.cc @@ -1,4 +1,4 @@ ---- net/base/network_change_notifier.cc.orig 2023-01-17 19:19:00 UTC +--- net/base/network_change_notifier.cc.orig 2023-03-13 07:33:08 UTC +++ net/base/network_change_notifier.cc @@ -37,7 +37,7 @@ #include "net/base/network_change_notifier_linux.h" @@ -9,7 +9,7 @@ #include "net/base/network_change_notifier_posix.h" #elif BUILDFLAG(IS_FUCHSIA) #include "net/base/network_change_notifier_fuchsia.h" -@@ -326,6 +326,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo +@@ -327,6 +327,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo #elif BUILDFLAG(IS_FUCHSIA) return std::make_unique<NetworkChangeNotifierFuchsia>( /*require_wlan=*/false); diff --git a/www/iridium/files/patch-net_cert_cert__verify__proc.cc b/www/iridium/files/patch-net_cert_cert__verify__proc.cc index 3b7c1214d755..eec01ecc5a97 100644 --- a/www/iridium/files/patch-net_cert_cert__verify__proc.cc +++ b/www/iridium/files/patch-net_cert_cert__verify__proc.cc @@ -1,6 +1,6 @@ ---- net/cert/cert_verify_proc.cc.orig 2022-12-06 08:09:13 UTC +--- net/cert/cert_verify_proc.cc.orig 2023-03-13 07:33:08 UTC +++ net/cert/cert_verify_proc.cc -@@ -506,7 +506,7 @@ base::Value CertVerifyParams(X509Certificate* cert, +@@ -495,7 +495,7 @@ base::Value CertVerifyParams(X509Certificate* cert, } // namespace diff --git a/www/iridium/files/patch-net_cert_cert__verify__proc__unittest.cc b/www/iridium/files/patch-net_cert_cert__verify__proc__unittest.cc index 1951e8559ded..cec933612389 100644 --- a/www/iridium/files/patch-net_cert_cert__verify__proc__unittest.cc +++ b/www/iridium/files/patch-net_cert_cert__verify__proc__unittest.cc @@ -1,6 +1,6 @@ ---- net/cert/cert_verify_proc_unittest.cc.orig 2022-12-06 08:09:13 UTC +--- net/cert/cert_verify_proc_unittest.cc.orig 2023-03-13 07:33:08 UTC +++ net/cert/cert_verify_proc_unittest.cc -@@ -242,7 +242,7 @@ const std::vector<CertVerifyProcType> kAllCertVerifier +@@ -270,7 +270,7 @@ const std::vector<CertVerifyProcType> kAllCertVerifier #if BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED) CERT_VERIFY_PROC_BUILTIN_CHROME_ROOTS #endif diff --git a/www/iridium/files/patch-net_dns_BUILD.gn b/www/iridium/files/patch-net_dns_BUILD.gn index 47affa69416e..6142a0522243 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 2023-01-17 19:19:00 UTC +--- net/dns/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ net/dns/BUILD.gn -@@ -122,7 +122,7 @@ source_set("dns") { +@@ -124,7 +124,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", -@@ -163,6 +163,7 @@ source_set("dns") { +@@ -165,6 +165,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +17,7 @@ ] allow_circular_includes_from = [ -@@ -425,9 +426,9 @@ source_set("tests") { +@@ -428,9 +429,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/www/iridium/files/patch-net_dns_dns__util.cc b/www/iridium/files/patch-net_dns_dns__util.cc index 56947885516c..cdf9e1b563fd 100644 --- a/www/iridium/files/patch-net_dns_dns__util.cc +++ b/www/iridium/files/patch-net_dns_dns__util.cc @@ -1,11 +1,11 @@ ---- net/dns/dns_util.cc.orig 2022-10-05 07:34:01 UTC +--- net/dns/dns_util.cc.orig 2023-03-13 07:33:08 UTC +++ net/dns/dns_util.cc -@@ -28,6 +28,8 @@ +@@ -29,6 +29,8 @@ + #include "net/dns/public/util.h" #include "net/third_party/uri_template/uri_template.h" - #include "third_party/abseil-cpp/absl/types/optional.h" +#include <sys/socket.h> + #if BUILDFLAG(IS_POSIX) - #include <netinet/in.h> #include <net/if.h> + #include <netinet/in.h> diff --git a/www/iridium/files/patch-net_dns_host__resolver__system__task.cc b/www/iridium/files/patch-net_dns_host__resolver__system__task.cc index 7ec5105c37e5..1f7af998b9b5 100644 --- a/www/iridium/files/patch-net_dns_host__resolver__system__task.cc +++ b/www/iridium/files/patch-net_dns_host__resolver__system__task.cc @@ -1,6 +1,6 @@ ---- net/dns/host_resolver_system_task.cc.orig 2023-01-17 19:19:00 UTC +--- net/dns/host_resolver_system_task.cc.orig 2023-03-13 07:33:08 UTC +++ net/dns/host_resolver_system_task.cc -@@ -351,8 +351,8 @@ void HostResolverSystemTask::OnLookupComplete(const ui +@@ -353,8 +353,8 @@ void HostResolverSystemTask::OnLookupComplete(const ui } void EnsureSystemHostResolverCallReady() { @@ -11,7 +11,7 @@ EnsureDnsReloaderInit(); #elif BUILDFLAG(IS_WIN) EnsureWinsockInit(); -@@ -438,7 +438,7 @@ int SystemHostResolverCall(const std::string& host, +@@ -440,7 +440,7 @@ int SystemHostResolverCall(const std::string& host, base::BlockingType::WILL_BLOCK); #if BUILDFLAG(IS_POSIX) && \ diff --git a/www/iridium/files/patch-net_proxy__resolution_proxy__config__service.cc b/www/iridium/files/patch-net_proxy__resolution_proxy__config__service.cc index 5dff3f544fbf..50b9e044181f 100644 --- a/www/iridium/files/patch-net_proxy__resolution_proxy__config__service.cc +++ b/www/iridium/files/patch-net_proxy__resolution_proxy__config__service.cc @@ -1,6 +1,6 @@ ---- net/proxy_resolution/proxy_config_service.cc.orig 2022-10-05 07:34:01 UTC +--- net/proxy_resolution/proxy_config_service.cc.orig 2023-03-13 07:33:08 UTC +++ net/proxy_resolution/proxy_config_service.cc -@@ -18,20 +18,20 @@ +@@ -19,20 +19,20 @@ #include "net/proxy_resolution/proxy_config_service_ios.h" #elif BUILDFLAG(IS_MAC) #include "net/proxy_resolution/proxy_config_service_mac.h" 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 bb68f0435cb0..a8435470af8f 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 2022-12-01 10:35:46 UTC +--- net/socket/udp_socket_posix.cc.orig 2023-03-13 07:33:08 UTC +++ net/socket/udp_socket_posix.cc -@@ -558,7 +558,7 @@ int UDPSocketPosix::SetDoNotFragment() { +@@ -559,7 +559,7 @@ int UDPSocketPosix::SetDoNotFragment() { } void UDPSocketPosix::SetMsgConfirm(bool confirm) { @@ -9,7 +9,7 @@ if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { -@@ -579,7 +579,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { +@@ -580,7 +580,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); int value = broadcast ? 1 : 0; int rv; @@ -18,7 +18,7 @@ // SO_REUSEPORT on OSX permits multiple processes to each receive // UDP multicast or broadcast datagrams destined for the bound // port. -@@ -892,7 +892,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) +@@ -893,7 +893,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) #if BUILDFLAG(IS_CHROMEOS_ASH) if (last_error == EINVAL) return ERR_ADDRESS_IN_USE; diff --git a/www/iridium/files/patch-net_socket_udp__socket__unittest.cc b/www/iridium/files/patch-net_socket_udp__socket__unittest.cc index 02e8b127d50a..f2c22d2a84ce 100644 --- a/www/iridium/files/patch-net_socket_udp__socket__unittest.cc +++ b/www/iridium/files/patch-net_socket_udp__socket__unittest.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_unittest.cc.orig 2022-12-06 08:09:13 UTC +--- net/socket/udp_socket_unittest.cc.orig 2023-03-13 07:33:08 UTC +++ net/socket/udp_socket_unittest.cc -@@ -342,7 +342,7 @@ TEST_F(UDPSocketTest, PartialRecv) { +@@ -341,7 +341,7 @@ TEST_F(UDPSocketTest, PartialRecv) { EXPECT_EQ(second_packet, received); } @@ -9,7 +9,7 @@ // - MacOS: requires root permissions on OSX 10.7+. // - Android: devices attached to testbots don't have default network, so // broadcasting to 255.255.255.255 returns error -109 (Address not reachable). -@@ -602,7 +602,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) { +@@ -601,7 +601,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) { EXPECT_THAT(rv, IsOk()); rv = client.SetDoNotFragment(); @@ -18,7 +18,7 @@ // TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia. EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); #elif BUILDFLAG(IS_MAC) -@@ -630,7 +630,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) { +@@ -629,7 +629,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) { EXPECT_THAT(rv, IsOk()); rv = server.SetDoNotFragment(); @@ -27,7 +27,7 @@ // TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia. EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); #elif BUILDFLAG(IS_MAC) -@@ -695,7 +695,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { +@@ -694,7 +694,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { // TODO(https://crbug.com/947115): failing on device on iOS 12.2. // TODO(https://crbug.com/1227554): flaky on Mac 11. @@ -36,7 +36,7 @@ #define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress #else #define MAYBE_SharedMulticastAddress SharedMulticastAddress -@@ -749,7 +749,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { +@@ -748,7 +748,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { NetLogSource()); ASSERT_THAT(client_socket.Connect(send_address), IsOk()); diff --git a/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc index 4d68690bf657..d318732cbd29 100644 --- a/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc +++ b/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc @@ -1,6 +1,6 @@ ---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2022-10-05 07:34:01 UTC +--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2023-03-13 07:33:08 UTC +++ net/tools/cert_verify_tool/cert_verify_tool.cc -@@ -30,7 +30,7 @@ +@@ -31,7 +31,7 @@ #include "net/url_request/url_request_context_builder.h" #include "net/url_request/url_request_context_getter.h" @@ -9,7 +9,7 @@ #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif -@@ -60,7 +60,7 @@ void SetUpOnNetworkThread( +@@ -61,7 +61,7 @@ void SetUpOnNetworkThread( base::WaitableEvent* initialization_complete_event) { net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); @@ -18,7 +18,7 @@ // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // -@@ -217,7 +217,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr +@@ -222,7 +222,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr base::StringPiece impl_name, scoped_refptr<net::CertNetFetcher> cert_net_fetcher, RootStoreType root_store_type) { @@ -27,7 +27,7 @@ if (impl_name == "platform") { if (root_store_type != RootStoreType::kSystem) { std::cerr << "WARNING: platform verifier not supported with " -@@ -474,7 +474,7 @@ int main(int argc, char** argv) { +@@ -534,7 +534,7 @@ int main(int argc, char** argv) { std::string impls_str = command_line.GetSwitchValueASCII("impls"); if (impls_str.empty()) { // Default value. diff --git a/www/iridium/files/patch-net_tools_net__watcher_net__watcher.cc b/www/iridium/files/patch-net_tools_net__watcher_net__watcher.cc new file mode 100644 index 000000000000..9ff5e566ca60 --- /dev/null +++ b/www/iridium/files/patch-net_tools_net__watcher_net__watcher.cc @@ -0,0 +1,29 @@ +--- net/tools/net_watcher/net_watcher.cc.orig 2023-03-13 07:33:08 UTC ++++ net/tools/net_watcher/net_watcher.cc +@@ -32,7 +32,7 @@ + #include "net/proxy_resolution/proxy_config_service.h" + #include "net/proxy_resolution/proxy_config_with_annotation.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "net/base/network_change_notifier_linux.h" + #endif + +@@ -44,7 +44,7 @@ namespace { + + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Flag to specifies which network interfaces to ignore. Interfaces should + // follow as a comma seperated list. + const char kIgnoreNetifFlag[] = "ignore-netif"; +@@ -163,7 +163,7 @@ int main(int argc, char* argv[]) { + + NetWatcher net_watcher; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); + std::string ignored_netifs_str = + command_line->GetSwitchValueASCII(kIgnoreNetifFlag); diff --git a/www/iridium/files/patch-net_url__request_url__request.cc b/www/iridium/files/patch-net_url__request_url__request.cc index 969b09b3446a..4484cad4b92f 100644 --- a/www/iridium/files/patch-net_url__request_url__request.cc +++ b/www/iridium/files/patch-net_url__request_url__request.cc @@ -1,22 +1,22 @@ ---- net/url_request/url_request.cc.orig 2023-01-17 19:19:00 UTC +--- net/url_request/url_request.cc.orig 2023-03-13 07:33:08 UTC +++ net/url_request/url_request.cc -@@ -13,6 +13,7 @@ - #include "base/bind.h" - #include "base/callback.h" - #include "base/callback_helpers.h" +@@ -10,6 +10,7 @@ + # include <unistd.h> + #endif + +#include "base/command_line.h" #include "base/compiler_specific.h" - #include "base/metrics/histogram_macros.h" - #include "base/rand_util.h" -@@ -20,6 +21,7 @@ - #include "base/synchronization/lock.h" - #include "base/threading/thread_task_runner_handle.h" + #include "base/functional/bind.h" + #include "base/functional/callback.h" +@@ -21,6 +22,7 @@ + #include "base/task/single_thread_task_runner.h" + #include "base/types/pass_key.h" #include "base/values.h" +#include "content/public/common/content_switches.h" #include "net/base/auth.h" + #include "net/base/io_buffer.h" #include "net/base/load_flags.h" - #include "net/base/load_timing_info.h" -@@ -54,7 +56,10 @@ namespace iridium { +@@ -56,7 +58,10 @@ namespace iridium { void textlog_request(const char *caller, const GURL &url) { diff --git a/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc index ee68f4c651c5..2679c594cec5 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 2022-12-06 08:09:13 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2023-03-13 07:33:08 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -82,7 +82,7 @@ +@@ -84,7 +84,7 @@ #include "gin/public/cppgc.h" #endif @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -521,7 +521,7 @@ void InitializeSDK(bool enable_v8, FontMappingMode fon +@@ -526,7 +526,7 @@ void InitializeSDK(bool enable_v8, FontMappingMode fon FPDF_InitLibraryWithConfig(&config); diff --git a/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.cc b/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.cc index 7c6f8688d886..7b16301340b5 100644 --- a/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.cc +++ b/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.cc @@ -1,4 +1,4 @@ ---- printing/mojom/printing_context_mojom_traits.cc.orig 2022-10-05 07:34:01 UTC +--- printing/mojom/printing_context_mojom_traits.cc.orig 2023-03-13 07:33:08 UTC +++ printing/mojom/printing_context_mojom_traits.cc @@ -15,7 +15,7 @@ #include "ui/gfx/geometry/mojom/geometry_mojom_traits.h" @@ -9,7 +9,7 @@ #include "mojo/public/mojom/base/values.mojom.h" #endif -@@ -147,7 +147,7 @@ bool StructTraits< +@@ -149,7 +149,7 @@ bool StructTraits< } out->set_pages_per_sheet(data.pages_per_sheet()); diff --git a/www/iridium/files/patch-printing_print__settings.cc b/www/iridium/files/patch-printing_print__settings.cc index d641f7cefbb1..989f4cae0060 100644 --- a/www/iridium/files/patch-printing_print__settings.cc +++ b/www/iridium/files/patch-printing_print__settings.cc @@ -1,6 +1,6 @@ ---- printing/print_settings.cc.orig 2023-01-17 19:19:00 UTC +--- printing/print_settings.cc.orig 2023-03-13 07:33:08 UTC +++ printing/print_settings.cc -@@ -272,7 +272,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet +@@ -256,7 +256,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet #endif is_modifiable_ = settings.is_modifiable_; pages_per_sheet_ = settings.pages_per_sheet_; @@ -9,7 +9,7 @@ for (const auto& item : settings.advanced_settings_) advanced_settings_.emplace(item.first, item.second.Clone()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -313,7 +313,7 @@ void PrintSettings::Clear() { +@@ -298,7 +298,7 @@ void PrintSettings::Clear() { #endif is_modifiable_ = true; pages_per_sheet_ = 1; diff --git a/www/iridium/files/patch-printing_print__settings.h b/www/iridium/files/patch-printing_print__settings.h index 329e724dd30d..bd773da53103 100644 --- a/www/iridium/files/patch-printing_print__settings.h +++ b/www/iridium/files/patch-printing_print__settings.h @@ -1,6 +1,6 @@ ---- printing/print_settings.h.orig 2023-01-17 19:19:00 UTC +--- printing/print_settings.h.orig 2023-03-13 07:33:08 UTC +++ printing/print_settings.h -@@ -18,7 +18,7 @@ +@@ -21,7 +21,7 @@ #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" @@ -9,7 +9,7 @@ #include <map> #include "base/values.h" -@@ -66,7 +66,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -69,7 +69,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { } }; @@ -18,7 +18,7 @@ using AdvancedSettings = std::map<std::string, base::Value>; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -221,7 +221,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -234,7 +234,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { pages_per_sheet_ = pages_per_sheet; } @@ -27,7 +27,7 @@ AdvancedSettings& advanced_settings() { return advanced_settings_; } const AdvancedSettings& advanced_settings() const { return advanced_settings_; -@@ -327,7 +327,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -351,7 +351,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { // Number of pages per sheet. int pages_per_sheet_; diff --git a/www/iridium/files/patch-printing_print__settings__conversion.cc b/www/iridium/files/patch-printing_print__settings__conversion.cc index dfc2f28d1359..de2cc8496b48 100644 --- a/www/iridium/files/patch-printing_print__settings__conversion.cc +++ b/www/iridium/files/patch-printing_print__settings__conversion.cc @@ -1,11 +1,11 @@ ---- printing/print_settings_conversion.cc.orig 2022-10-05 07:34:01 UTC +--- printing/print_settings_conversion.cc.orig 2023-03-13 07:33:08 UTC +++ printing/print_settings_conversion.cc -@@ -256,7 +256,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet +@@ -275,7 +275,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet settings->set_is_modifiable(is_modifiable.value()); } --#if BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && defined(USE_CUPS)) -+#if BUILDFLAG(IS_CHROMEOS) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_CUPS)) +-#if BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_CUPS)) ++#if BUILDFLAG(IS_CHROMEOS) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_CUPS)) const base::Value::Dict* advanced_settings = job_settings.FindDict(kSettingAdvancedSettings); if (advanced_settings) { diff --git a/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc b/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc index 7756bcffaf5a..907ed504611c 100644 --- a/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc +++ b/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc @@ -1,9 +1,9 @@ ---- printing/sandbox/print_backend_sandbox_hook_linux.cc.orig 2022-03-28 18:11:04 UTC +--- printing/sandbox/print_backend_sandbox_hook_linux.cc.orig 2023-03-13 07:33:08 UTC +++ printing/sandbox/print_backend_sandbox_hook_linux.cc -@@ -9,21 +9,28 @@ - #include "base/files/file_util.h" +@@ -10,21 +10,28 @@ #include "base/path_service.h" #include "build/build_config.h" + #include "printing/buildflags/buildflags.h" +#if !BUILDFLAG(IS_BSD) #include "sandbox/linux/syscall_broker/broker_command.h" #include "sandbox/linux/syscall_broker/broker_file_permission.h" @@ -14,7 +14,7 @@ +#include "sandbox/policy/openbsd/sandbox_openbsd.h" +#endif - #if BUILDFLAG(IS_CHROMEOS) && defined(USE_CUPS) + #if BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(USE_CUPS) #include "printing/backend/cups_connection_pool.h" #endif @@ -29,7 +29,7 @@ namespace { sandbox::syscall_broker::BrokerCommandSet GetPrintBackendBrokerCommandSet() { -@@ -84,9 +91,11 @@ std::vector<BrokerFilePermission> GetPrintBackendFileP +@@ -85,9 +92,11 @@ std::vector<BrokerFilePermission> GetPrintBackendFileP } } // namespace @@ -38,10 +38,10 @@ bool PrintBackendPreSandboxHook( sandbox::policy::SandboxLinux::Options options) { +#if !BUILDFLAG(IS_BSD) - #if BUILDFLAG(IS_CHROMEOS) && defined(USE_CUPS) + #if BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(USE_CUPS) // Create the socket connections to the CUPS server before engaging the // sandbox, since new connections cannot be made after that. -@@ -100,6 +109,7 @@ bool PrintBackendPreSandboxHook( +@@ -101,6 +110,7 @@ bool PrintBackendPreSandboxHook( sandbox::policy::SandboxLinux::PreSandboxHook(), options); instance->EngageNamespaceSandboxIfPossible(); diff --git a/www/iridium/files/patch-remoting_host_base_desktop__environment__options.cc b/www/iridium/files/patch-remoting_host_base_desktop__environment__options.cc new file mode 100644 index 000000000000..d3ab95944f57 --- /dev/null +++ b/www/iridium/files/patch-remoting_host_base_desktop__environment__options.cc @@ -0,0 +1,11 @@ +--- remoting/host/base/desktop_environment_options.cc.orig 2023-03-13 07:33:08 UTC ++++ remoting/host/base/desktop_environment_options.cc +@@ -119,7 +119,7 @@ bool DesktopEnvironmentOptions::capture_video_on_dedic + // TODO(joedow): Determine whether we can migrate additional platforms to + // using the DesktopCaptureWrapper instead of the DesktopCaptureProxy. Then + // clean up DesktopCapturerProxy::Core::CreateCapturer(). +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return capture_video_on_dedicated_thread_; + #else + return false; diff --git a/www/iridium/files/patch-remoting_host_basic__desktop__environment.cc b/www/iridium/files/patch-remoting_host_basic__desktop__environment.cc index 29f7bcad0b49..ed8f57e89032 100644 --- a/www/iridium/files/patch-remoting_host_basic__desktop__environment.cc +++ b/www/iridium/files/patch-remoting_host_basic__desktop__environment.cc @@ -1,6 +1,6 @@ ---- remoting/host/basic_desktop_environment.cc.orig 2022-12-06 08:09:13 UTC +--- remoting/host/basic_desktop_environment.cc.orig 2023-03-13 07:33:08 UTC +++ remoting/host/basic_desktop_environment.cc -@@ -179,7 +179,7 @@ BasicDesktopEnvironment::CreateVideoCapturer() { +@@ -182,7 +182,7 @@ BasicDesktopEnvironment::CreateVideoCapturer() { scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner; #if BUILDFLAG(IS_CHROMEOS_ASH) capture_task_runner = ui_task_runner_; diff --git a/www/iridium/files/patch-remoting_host_chromoting__host.cc b/www/iridium/files/patch-remoting_host_chromoting__host.cc index aca045db6b18..ac093a54a0b9 100644 --- a/www/iridium/files/patch-remoting_host_chromoting__host.cc +++ b/www/iridium/files/patch-remoting_host_chromoting__host.cc @@ -1,11 +1,11 @@ ---- remoting/host/chromoting_host.cc.orig 2023-01-17 19:19:00 UTC +--- remoting/host/chromoting_host.cc.orig 2023-03-13 07:33:08 UTC +++ remoting/host/chromoting_host.cc -@@ -125,7 +125,7 @@ void ChromotingHost::StartChromotingHostServices() { +@@ -132,7 +132,7 @@ void ChromotingHost::StartChromotingHostServices() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(!ipc_server_); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - ipc_server_ = std::make_unique< - named_mojo_ipc_server::NamedMojoIpcServer<mojom::ChromotingHostServices>>( - GetChromotingHostServicesServerName(), this, + named_mojo_ipc_server::EndpointOptions options; + options.server_name = GetChromotingHostServicesServerName(); + #if BUILDFLAG(IS_WIN) diff --git a/www/iridium/files/patch-remoting_host_chromoting__host__context.cc b/www/iridium/files/patch-remoting_host_chromoting__host__context.cc index 74c080c1f595..9e729b211052 100644 --- a/www/iridium/files/patch-remoting_host_chromoting__host__context.cc +++ b/www/iridium/files/patch-remoting_host_chromoting__host__context.cc @@ -1,6 +1,6 @@ ---- remoting/host/chromoting_host_context.cc.orig 2022-03-28 18:11:04 UTC +--- remoting/host/chromoting_host_context.cc.orig 2023-03-13 07:33:08 UTC +++ remoting/host/chromoting_host_context.cc -@@ -143,7 +143,7 @@ std::unique_ptr<ChromotingHostContext> ChromotingHostC +@@ -144,7 +144,7 @@ std::unique_ptr<ChromotingHostContext> ChromotingHostC // on a UI thread. scoped_refptr<AutoThreadTaskRunner> input_task_runner = AutoThread::CreateWithType("ChromotingInputThread", ui_task_runner, diff --git a/www/iridium/files/patch-remoting_host_chromoting__host__services__client.cc b/www/iridium/files/patch-remoting_host_chromoting__host__services__client.cc index edbf3921e0aa..2bb61f94a16a 100644 --- a/www/iridium/files/patch-remoting_host_chromoting__host__services__client.cc +++ b/www/iridium/files/patch-remoting_host_chromoting__host__services__client.cc @@ -1,6 +1,6 @@ ---- remoting/host/chromoting_host_services_client.cc.orig 2022-03-28 18:11:04 UTC +--- remoting/host/chromoting_host_services_client.cc.orig 2023-03-13 07:33:08 UTC +++ remoting/host/chromoting_host_services_client.cc -@@ -28,7 +28,7 @@ bool g_initialized = false; +@@ -51,7 +51,7 @@ mojo::PendingRemote<mojom::ChromotingHostServices> Con } // namespace @@ -9,7 +9,7 @@ // static constexpr char -@@ -112,7 +112,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic +@@ -129,7 +129,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic if (session_services_remote_.is_bound()) { return true; } diff --git a/www/iridium/files/patch-remoting_host_desktop__capturer__proxy.cc b/www/iridium/files/patch-remoting_host_desktop__capturer__proxy.cc new file mode 100644 index 000000000000..e60f84a13e4b --- /dev/null +++ b/www/iridium/files/patch-remoting_host_desktop__capturer__proxy.cc @@ -0,0 +1,20 @@ +--- remoting/host/desktop_capturer_proxy.cc.orig 2023-03-13 07:33:08 UTC ++++ remoting/host/desktop_capturer_proxy.cc +@@ -30,7 +30,7 @@ + #include "remoting/host/chromeos/frame_sink_desktop_capturer.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/environment.h" + #include "base/nix/xdg_util.h" + #include "remoting/host/linux/wayland_desktop_capturer.h" +@@ -96,7 +96,7 @@ void DesktopCapturerProxy::Core::CreateCapturer( + capturer_ = std::make_unique<webrtc::DesktopCapturerDifferWrapper>( + std::make_unique<AuraDesktopCapturer>()); + } +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + static base::nix::SessionType session_type = base::nix::SessionType::kUnset; + if (session_type == base::nix::SessionType::kUnset) { + std::unique_ptr<base::Environment> env = base::Environment::Create(); diff --git a/www/iridium/files/patch-remoting_host_host__attributes.cc b/www/iridium/files/patch-remoting_host_host__attributes.cc index 08a85daadd6e..e46fd5ab75ce 100644 --- a/www/iridium/files/patch-remoting_host_host__attributes.cc +++ b/www/iridium/files/patch-remoting_host_host__attributes.cc @@ -1,6 +1,6 @@ ---- remoting/host/host_attributes.cc.orig 2022-10-05 07:34:01 UTC +--- remoting/host/host_attributes.cc.orig 2023-03-13 07:33:08 UTC +++ remoting/host/host_attributes.cc -@@ -121,7 +121,7 @@ std::string GetHostAttributes() { +@@ -108,7 +108,7 @@ std::string GetHostAttributes() { media::InitializeMediaFoundation()) { result.push_back("HWEncoder"); } diff --git a/www/iridium/files/patch-remoting_host_host__main.cc b/www/iridium/files/patch-remoting_host_host__main.cc index ba70bb6cd120..5becc15eafec 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 2022-10-05 07:34:01 UTC +--- remoting/host/host_main.cc.orig 2023-03-13 07:33:08 UTC +++ remoting/host/host_main.cc @@ -50,7 +50,7 @@ int FileChooserMain(); int RdpDesktopSessionMain(); @@ -18,7 +18,7 @@ " --audio-pipe-name=<pipe> - Sets the pipe name to capture audio on " "Linux.\n" #endif // BUILDFLAG(IS_LINUX) -@@ -155,7 +155,7 @@ MainRoutineFn SelectMainRoutine(const std::string& pro +@@ -156,7 +156,7 @@ MainRoutineFn SelectMainRoutine(const std::string& pro } else if (process_type == kProcessTypeUrlForwarderConfigurator) { main_routine = &UrlForwarderConfiguratorMain; #endif // BUILDFLAG(IS_WIN) diff --git a/www/iridium/files/patch-remoting_host_ipc__constants.cc b/www/iridium/files/patch-remoting_host_ipc__constants.cc index c15b2240511f..e53c3b4fd17a 100644 --- a/www/iridium/files/patch-remoting_host_ipc__constants.cc +++ b/www/iridium/files/patch-remoting_host_ipc__constants.cc @@ -1,4 +1,4 @@ ---- remoting/host/ipc_constants.cc.orig 2023-01-17 19:19:00 UTC +--- remoting/host/ipc_constants.cc.orig 2023-03-13 07:33:08 UTC +++ remoting/host/ipc_constants.cc @@ -17,7 +17,7 @@ namespace remoting { @@ -9,7 +9,7 @@ #if !defined(NDEBUG) // Use a different IPC name for debug builds so that we can run the host -@@ -66,7 +66,7 @@ GetChromotingHostServicesServerName() { +@@ -68,7 +68,7 @@ GetChromotingHostServicesServerName() { static const base::NoDestructor<mojo::NamedPlatformChannel::ServerName> server_name( named_mojo_ipc_server::WorkingDirectoryIndependentServerNameFromUTF8( diff --git a/www/iridium/files/patch-remoting_host_it2me_it2me__host.cc b/www/iridium/files/patch-remoting_host_it2me_it2me__host.cc new file mode 100644 index 000000000000..1044537975da --- /dev/null +++ b/www/iridium/files/patch-remoting_host_it2me_it2me__host.cc @@ -0,0 +1,29 @@ +--- remoting/host/it2me/it2me_host.cc.orig 2023-03-13 07:33:08 UTC ++++ remoting/host/it2me/it2me_host.cc +@@ -43,7 +43,7 @@ + #include "remoting/signaling/signaling_id_util.h" + #include "services/network/public/cpp/shared_url_loader_factory.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "remoting/host/linux/wayland_manager.h" + #include "remoting/host/linux/wayland_utils.h" + #endif // BUILDFLAG(IS_LINUX) +@@ -144,7 +144,7 @@ void It2MeHost::Connect( + + OnPolicyUpdate(std::move(policies)); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (IsRunningWayland()) { + WaylandManager::Get()->Init(host_context_->ui_task_runner()); + } +@@ -283,7 +283,7 @@ void It2MeHost::ConnectOnNetworkThread( + + // Set up the desktop environment options. + DesktopEnvironmentOptions options(DesktopEnvironmentOptions::CreateDefault()); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (IsRunningWayland()) { + options.desktop_capture_options()->set_prefer_cursor_embedded(true); + } 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 ad110758e34e..7fde9a568c59 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 2022-12-06 08:09:13 UTC +--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2023-03-13 07:33:08 UTC +++ remoting/host/it2me/it2me_native_messaging_host_main.cc @@ -30,7 +30,7 @@ #include "remoting/host/resources.h" @@ -6,42 +6,42 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #if defined(REMOTING_USE_X11) || defined(REMOTING_USE_WAYLAND) + #if defined(REMOTING_USE_X11) #include <gtk/gtk.h> #include "base/linux_util.h" -@@ -80,7 +80,7 @@ bool CurrentProcessHasUiAccess() { +@@ -78,7 +78,7 @@ bool CurrentProcessHasUiAccess() { // Creates a It2MeNativeMessagingHost instance, attaches it to stdin/stdout and // runs the task executor until It2MeNativeMessagingHost signals shutdown. int It2MeNativeMessagingHostMain(int argc, char** argv) { -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) - // Initialize Xlib for multi-threaded use, allowing non-Chromium code to - // use X11 safely (such as the WebRTC capturer, GTK ...) - x11::InitXlib(); + if (!IsRunningWayland()) { + // Initialize Xlib for multi-threaded use, allowing non-Chromium code to + // use X11 safely (such as the WebRTC capturer, GTK ...) @@ -126,7 +126,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv remoting::LoadResources(""); --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ - (defined(REMOTING_USE_X11) || defined(REMOTING_USE_WAYLAND)) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) // Required for any calls into GTK functions, such as the Disconnect and // Continue windows. Calling with nullptr arguments because we don't have -@@ -261,7 +261,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv + // any command line arguments for gtk to consume. +@@ -260,7 +260,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv PolicyWatcher::CreateWithTaskRunner(context->file_task_runner(), context->management_service()); -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) - // Create an X11EventSource on all UI threads, so the global X11 connection - // (x11::Connection::Get()) can dispatch X events. - auto event_source = -@@ -284,7 +284,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv + scoped_refptr<AutoThreadTaskRunner> input_task_runner; + if (!IsRunningWayland()) { + // Create an X11EventSource on all UI threads, so the global X11 connection +@@ -287,7 +287,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv // Run the loop until channel is alive. run_loop.Run(); -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) - input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { - delete ui::X11EventSource::GetInstance(); - })); + if (!IsRunningWayland()) { + input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { + delete ui::X11EventSource::GetInstance(); diff --git a/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc b/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc index a217bfbf3847..f704da5dd17c 100644 --- a/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc +++ b/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc @@ -1,15 +1,33 @@ ---- remoting/host/me2me_desktop_environment.cc.orig 2023-01-17 19:19:00 UTC +--- remoting/host/me2me_desktop_environment.cc.orig 2023-03-13 07:33:08 UTC +++ remoting/host/me2me_desktop_environment.cc -@@ -124,7 +124,7 @@ std::string Me2MeDesktopEnvironment::GetCapabilities() +@@ -125,7 +125,7 @@ std::string Me2MeDesktopEnvironment::GetCapabilities() capabilities += protocol::kRemoteWebAuthnCapability; } -#if BUILDFLAG(IS_LINUX) && defined(REMOTING_USE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) - capabilities += " "; - capabilities += protocol::kMultiStreamCapability; + if (!IsRunningWayland()) { + capabilities += " "; + capabilities += protocol::kMultiStreamCapability; +@@ -164,7 +164,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( + // properly under Xvfb. + mutable_desktop_capture_options()->set_use_update_notifications(true); -@@ -180,7 +180,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Setting this option to false means that the capture differ wrapper will not + // be used when the X11 capturer is selected. This reduces the X11 capture + // time by a few milliseconds per frame and is safe because we can rely on +@@ -173,7 +173,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( + mutable_desktop_capture_options()->set_detect_updated_region(false); + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (IsRunningWayland()) { + mutable_desktop_capture_options()->set_prefer_cursor_embedded(false); + } +@@ -198,7 +198,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( // Otherwise, if the session is shared with the local user start monitoring // the local input and create the in-session UI. diff --git a/www/iridium/files/patch-remoting_host_mouse__cursor__monitor__proxy.cc b/www/iridium/files/patch-remoting_host_mouse__cursor__monitor__proxy.cc new file mode 100644 index 000000000000..a49a9ae29f75 --- /dev/null +++ b/www/iridium/files/patch-remoting_host_mouse__cursor__monitor__proxy.cc @@ -0,0 +1,11 @@ +--- remoting/host/mouse_cursor_monitor_proxy.cc.orig 2023-03-13 07:33:08 UTC ++++ remoting/host/mouse_cursor_monitor_proxy.cc +@@ -73,7 +73,7 @@ void MouseCursorMonitorProxy::Core::CreateMouseCursorM + + #if BUILDFLAG(IS_CHROMEOS_ASH) + mouse_cursor_monitor_ = std::make_unique<MouseCursorMonitorAura>(); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (IsRunningWayland()) { + mouse_cursor_monitor_ = webrtc::MouseCursorMonitor::Create(options); + } else { diff --git a/www/iridium/files/patch-remoting_host_remote__open__url_remote__open__url__util.cc b/www/iridium/files/patch-remoting_host_remote__open__url_remote__open__url__util.cc index 9c9f53bd77b0..31b2e58118e2 100644 --- a/www/iridium/files/patch-remoting_host_remote__open__url_remote__open__url__util.cc +++ b/www/iridium/files/patch-remoting_host_remote__open__url_remote__open__url__util.cc @@ -1,6 +1,6 @@ ---- remoting/host/remote_open_url/remote_open_url_util.cc.orig 2022-03-28 18:11:04 UTC +--- remoting/host/remote_open_url/remote_open_url_util.cc.orig 2023-03-13 07:33:08 UTC +++ remoting/host/remote_open_url/remote_open_url_util.cc -@@ -30,7 +30,7 @@ const wchar_t kRegisteredApplicationsKeyName[] = +@@ -29,7 +29,7 @@ const wchar_t kRegisteredApplicationsKeyName[] = #endif // defined (OS_WIN) bool IsRemoteOpenUrlSupported() { @@ -8,4 +8,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return true; #elif BUILDFLAG(IS_WIN) - // The modern default apps settings dialog is only available to Windows 8+. + // The MSI installs the ProgID and capabilities into registry, but not the 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 e060305b3bc5..0d959fb498d7 100644 --- a/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,15 +1,15 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2022-12-06 08:09:13 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2023-03-13 07:33:08 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -125,7 +125,7 @@ +@@ -126,7 +126,7 @@ #include "remoting/host/mac/permission_utils.h" #endif // BUILDFLAG(IS_APPLE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #if defined(REMOTING_USE_X11) || defined(REMOTING_USE_WAYLAND) + #if defined(REMOTING_USE_X11) #include <gtk/gtk.h> - #endif // defined(REMOTING_USE_X11) || defined(REMOTING_USE_WAYLAND) -@@ -136,13 +136,13 @@ + #endif // defined(REMOTING_USE_X11) +@@ -137,13 +137,13 @@ #endif // defined(REMOTING_USE_X11) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -25,7 +25,16 @@ #include "remoting/host/host_utmp_logger.h" #endif -@@ -184,7 +184,7 @@ const char kApplicationName[] = "chromoting"; +@@ -156,7 +156,7 @@ + #include "remoting/host/win/session_desktop_environment.h" + #endif // BUILDFLAG(IS_WIN) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "remoting/host/linux/wayland_manager.h" + #include "remoting/host/linux/wayland_utils.h" + #endif // BUILDFLAG(IS_LINUX) +@@ -186,7 +186,7 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -34,7 +43,7 @@ // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; -@@ -392,7 +392,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -394,7 +394,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; @@ -43,7 +52,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -458,7 +458,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -463,7 +463,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<HostStatusLogger> host_status_logger_; std::unique_ptr<HostEventLogger> host_event_logger_; @@ -52,7 +61,7 @@ std::unique_ptr<HostUTMPLogger> host_utmp_logger_; #endif std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_; -@@ -767,7 +767,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -774,7 +774,7 @@ void HostProcess::StartOnNetworkThread() { void HostProcess::ShutdownOnNetworkThread() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); config_watcher_.reset(); @@ -61,7 +70,7 @@ cert_watcher_.reset(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -826,7 +826,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -835,7 +835,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); @@ -70,16 +79,23 @@ if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -949,7 +949,7 @@ void HostProcess::StartOnUiThread() { - WaylandManager::Get()->Init(context_->ui_task_runner()); - #endif // defined(REMOTING_USE_WAYLAND +@@ -954,13 +954,13 @@ void HostProcess::StartOnUiThread() { + base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), + base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (IsRunningWayland()) { + WaylandManager::Get()->Init(context_->ui_task_runner()); + } + #endif // BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. - base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()-> -@@ -1020,7 +1020,7 @@ void HostProcess::ShutdownOnUiThread() { + base::FilePath audio_pipe_name = +@@ -1032,7 +1032,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -88,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. -@@ -1028,7 +1028,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1040,7 +1040,7 @@ void HostProcess::ShutdownOnUiThread() { AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -97,7 +113,7 @@ context_->input_task_runner()->PostTask( FROM_HERE, base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); })); -@@ -1355,7 +1355,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V +@@ -1371,7 +1371,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V // Returns false: never restart the host after this policy update. DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); @@ -105,26 +121,26 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) absl::optional<bool> host_username_match_required = policies.FindBool(policy::key::kRemoteAccessHostMatchUsername); - if (!host_username_match_required.has_value()) -@@ -1741,7 +1741,7 @@ void HostProcess::StartHost() { - // The feature is enabled for all Googlers using a supported platform. - desktop_environment_options_.set_enable_remote_open_url(is_googler_); + if (!host_username_match_required.has_value()) { +@@ -1780,7 +1780,7 @@ void HostProcess::StartHost() { + // won't be advertised if it's missing a registry key or something. + desktop_environment_options_.set_enable_remote_open_url(true); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) desktop_environment_options_.set_enable_remote_webauthn(is_googler_); #endif -@@ -1774,7 +1774,7 @@ void HostProcess::StartHost() { +@@ -1813,7 +1813,7 @@ void HostProcess::StartHost() { host_status_logger_ = std::make_unique<HostStatusLogger>( host_->status_monitor(), log_to_server_.get()); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); - if (cmd_line->HasSwitch(kEnableUtempter)) + if (cmd_line->HasSwitch(kEnableUtempter)) { host_utmp_logger_ = -@@ -1943,7 +1943,7 @@ int HostProcessMain() { +@@ -1984,7 +1984,7 @@ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); @@ -133,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 ...) -@@ -1991,7 +1991,7 @@ int HostProcessMain() { +@@ -2033,7 +2033,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); diff --git a/www/iridium/files/patch-remoting_host_setup_start__host__main.cc b/www/iridium/files/patch-remoting_host_setup_start__host__main.cc index bc92848ec4d3..43d778e2c32d 100644 --- a/www/iridium/files/patch-remoting_host_setup_start__host__main.cc +++ b/www/iridium/files/patch-remoting_host_setup_start__host__main.cc @@ -1,4 +1,4 @@ ---- remoting/host/setup/start_host_main.cc.orig 2022-12-01 10:35:46 UTC +--- remoting/host/setup/start_host_main.cc.orig 2023-03-13 07:33:08 UTC +++ remoting/host/setup/start_host_main.cc @@ -33,7 +33,7 @@ #include <unistd.h> @@ -9,7 +9,7 @@ #include "remoting/host/setup/daemon_controller_delegate_linux.h" #include "remoting/host/setup/start_host_as_root.h" #endif // BUILDFLAG(IS_LINUX) -@@ -127,7 +127,7 @@ void OnDone(HostStarter::Result result) { +@@ -130,7 +130,7 @@ void OnDone(HostStarter::Result result) { } // namespace int StartHostMain(int argc, char** argv) { @@ -18,7 +18,7 @@ // Minimize the amount of code that runs as root on Posix systems. if (getuid() == 0) { return remoting::StartHostAsRoot(argc, argv); -@@ -170,7 +170,7 @@ int StartHostMain(int argc, char** argv) { +@@ -173,7 +173,7 @@ int StartHostMain(int argc, char** argv) { // for the account which generated |code|. std::string host_owner = command_line->GetSwitchValueASCII("host-owner"); diff --git a/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc b/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc index 650242d6b215..6323afbbf403 100644 --- a/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc +++ b/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc @@ -1,7 +1,7 @@ ---- remoting/host/webauthn/remote_webauthn_extension_notifier.cc.orig 2022-10-05 07:34:01 UTC +--- remoting/host/webauthn/remote_webauthn_extension_notifier.cc.orig 2023-03-13 07:33:08 UTC +++ remoting/host/webauthn/remote_webauthn_extension_notifier.cc -@@ -23,7 +23,7 @@ - #include "base/threading/sequenced_task_runner_handle.h" +@@ -24,7 +24,7 @@ + #include "base/task/thread_pool.h" #include "build/build_config.h" -#if BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #include "base/strings/string_util.h" -@@ -68,14 +68,14 @@ static constexpr char kExtensionWakeupFileContent[] = +@@ -69,14 +69,14 @@ static constexpr char kExtensionWakeupFileContent[] = // Caller should check if the directory exists before writing files to it. A // directory only exists if the corresponding Chrome version is installed. std::vector<base::FilePath> GetRemoteStateChangeDirPaths() { diff --git a/www/iridium/files/patch-remoting_protocol_webrtc__video__stream.cc b/www/iridium/files/patch-remoting_protocol_webrtc__video__stream.cc index d644fb20662a..ce60dc3b4d78 100644 --- a/www/iridium/files/patch-remoting_protocol_webrtc__video__stream.cc +++ b/www/iridium/files/patch-remoting_protocol_webrtc__video__stream.cc @@ -1,6 +1,6 @@ ---- remoting/protocol/webrtc_video_stream.cc.orig 2022-12-06 08:09:13 UTC +--- remoting/protocol/webrtc_video_stream.cc.orig 2023-03-13 07:33:08 UTC +++ remoting/protocol/webrtc_video_stream.cc -@@ -219,7 +219,7 @@ WebrtcVideoStream::WebrtcVideoStream(const std::string +@@ -242,7 +242,7 @@ WebrtcVideoStream::WebrtcVideoStream(const std::string : stream_name_(stream_name), session_options_(session_options) { // TODO(joedow): Dig into the threading model on other platforms to see if they // can also be updated to run on a dedicated thread. diff --git a/www/iridium/files/patch-sandbox_linux_BUILD.gn b/www/iridium/files/patch-sandbox_linux_BUILD.gn index ad2afdf46f54..e9e825f590b0 100644 --- a/www/iridium/files/patch-sandbox_linux_BUILD.gn +++ b/www/iridium/files/patch-sandbox_linux_BUILD.gn @@ -1,6 +1,6 @@ ---- sandbox/linux/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- sandbox/linux/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ sandbox/linux/BUILD.gn -@@ -12,12 +12,12 @@ if (is_android) { +@@ -12,11 +12,11 @@ if (is_android) { } declare_args() { @@ -10,18 +10,15 @@ - compile_credentials = is_linux || is_chromeos + compile_credentials = (is_linux || is_chromeos) && !is_bsd - # On Android, use plain GTest. -- use_base_test_suite = is_linux || is_chromeos -+ use_base_test_suite = (is_linux || is_chromeos) && !is_bsd - } +- compile_syscall_broker = is_linux || is_chromeos ++ compile_syscall_broker = (is_linux || is_chromeos) && !is_bsd - # We have two principal targets: sandbox and sandbox_linux_unittests -@@ -367,6 +367,39 @@ component("sandbox_services") { - sources += [ - "services/libc_interceptor.cc", + # On Android, use plain GTest. + use_base_test_suite = is_linux || is_chromeos +@@ -379,6 +379,17 @@ component("sandbox_services") { "services/libc_interceptor.h", -+ ] -+ } + ] + } + + if (is_bsd) { + sources -= [ @@ -31,28 +28,8 @@ + "services/syscall_wrappers.h", + "services/yama.cc", + "services/yama.h", -+ "syscall_broker/broker_channel.cc", -+ "syscall_broker/broker_channel.h", -+ "syscall_broker/broker_client.cc", -+ "syscall_broker/broker_client.h", -+ "syscall_broker/broker_command.cc", -+ "syscall_broker/broker_command.h", -+ "syscall_broker/broker_file_permission.cc", -+ "syscall_broker/broker_file_permission.h", -+ "syscall_broker/broker_host.cc", -+ "syscall_broker/broker_host.h", -+ "syscall_broker/broker_permission_list.cc", -+ "syscall_broker/broker_permission_list.h", -+ "syscall_broker/broker_process.cc", -+ "syscall_broker/broker_process.h", -+ "syscall_broker/broker_sandbox_config.cc", -+ "syscall_broker/broker_sandbox_config.h", -+ "syscall_broker/broker_simple_message.cc", -+ "syscall_broker/broker_simple_message.h", -+ "syscall_broker/remote_syscall_arg_handler.cc", -+ "syscall_broker/remote_syscall_arg_handler.h", -+ "syscall_broker/syscall_dispatcher.cc", -+ "syscall_broker/syscall_dispatcher.h", - ] - } ++ ] ++ } } + + source_set("sandbox_services_headers") { diff --git a/www/iridium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc b/www/iridium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc index b0b85e079d73..e0d4f59859f3 100644 --- a/www/iridium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc +++ b/www/iridium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/freebsd/sandbox_freebsd.cc.orig 2022-10-05 07:34:01 UTC +--- sandbox/policy/freebsd/sandbox_freebsd.cc.orig 2023-03-13 07:33:08 UTC +++ sandbox/policy/freebsd/sandbox_freebsd.cc -@@ -0,0 +1,253 @@ +@@ -0,0 +1,239 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -21,8 +21,6 @@ +#include <string> +#include <vector> + -+#include "base/bind.h" -+#include "base/callback_helpers.h" +#include "base/command_line.h" +#include "base/debug/stack_trace.h" +#include "base/feature_list.h" @@ -60,11 +58,8 @@ +#include "crypto/nss_util.h" +#endif + -+#include "ui/gfx/x/connection.h" +#include "ui/gfx/font_util.h" + -+#include <X11/Xlib.h> -+ +#define MAXTOKENS 3 + +#define _UNVEIL_MAIN "/etc/iridium/unveil.main"; @@ -125,15 +120,6 @@ + crypto::EnsureNSSInit(); +#endif + -+ // cache the XErrorDB by forcing a read on it -+ { -+ auto* connection = x11::Connection::Get(); -+ auto* display = connection->GetXlibDisplay().display(); -+ -+ char buf[1]; -+ XGetErrorDatabaseText(display, "XProtoError", "0", "", buf, std::size(buf)); -+ } -+ + if (process_type.empty()) { + base::FilePath cache_directory, local_directory; + diff --git a/www/iridium/files/patch-sandbox_policy_mojom_sandbox.mojom b/www/iridium/files/patch-sandbox_policy_mojom_sandbox.mojom index be313e92a12f..2af7c61356f0 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 2022-10-05 07:34:01 UTC +--- sandbox/policy/mojom/sandbox.mojom.orig 2023-03-13 07:33:08 UTC +++ sandbox/policy/mojom/sandbox.mojom -@@ -72,6 +72,12 @@ enum Sandbox { - [EnableIf=is_fuchsia] - kVideoCapture, +@@ -76,6 +76,12 @@ enum Sandbox { + [EnableIf=is_win] + kFileUtil, + [EnableIf=is_openbsd] + kVideoCapture, diff --git a/www/iridium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc b/www/iridium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc index 089b476617e8..5bc9dadb682a 100644 --- a/www/iridium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc +++ b/www/iridium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2022-10-05 07:34:01 UTC +--- sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2023-03-13 07:33:08 UTC +++ sandbox/policy/openbsd/sandbox_openbsd.cc -@@ -0,0 +1,413 @@ +@@ -0,0 +1,399 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -22,8 +22,6 @@ +#include <string> +#include <vector> + -+#include "base/bind.h" -+#include "base/callback_helpers.h" +#include "base/command_line.h" +#include "base/debug/stack_trace.h" +#include "base/feature_list.h" @@ -63,11 +61,8 @@ + +#include "third_party/boringssl/src/include/openssl/crypto.h" + -+#include "ui/gfx/x/connection.h" +#include "ui/gfx/font_util.h" + -+#include <X11/Xlib.h> -+ +#define MAXTOKENS 3 + +#define _UNVEIL_MAIN "/etc/iridium/unveil.main"; @@ -133,15 +128,6 @@ + if (process_type.empty()) + CRYPTO_pre_sandbox_init(); + -+ // cache the XErrorDB by forcing a read on it -+ { -+ auto* connection = x11::Connection::Get(); -+ auto* display = connection->GetXlibDisplay().display(); -+ -+ char buf[1]; -+ XGetErrorDatabaseText(display, "XProtoError", "0", "", buf, std::size(buf)); -+ } -+ + if (process_type.empty()) { + base::FilePath cache_directory, local_directory; + @@ -330,7 +316,7 @@ + // flock needed by sqlite3 locking + SetPledge("stdio rpath flock prot_exec recvfd sendfd ps", NULL); + } else if (process_type == switches::kGpuProcess) { -+ SetPledge("stdio rpath cpath wpath getpw drm prot_exec recvfd sendfd tmppath", NULL); ++ SetPledge("stdio rpath flock cpath wpath getpw drm prot_exec recvfd sendfd tmppath", NULL); + } else if (process_type == switches::kPpapiPluginProcess) { + // prot_exec needed by v8 + SetPledge("stdio rpath prot_exec recvfd sendfd", NULL); diff --git a/www/iridium/files/patch-sandbox_policy_sandbox__type.cc b/www/iridium/files/patch-sandbox_policy_sandbox__type.cc index f936fda487c3..8d8a543a8e40 100644 --- a/www/iridium/files/patch-sandbox_policy_sandbox__type.cc +++ b/www/iridium/files/patch-sandbox_policy_sandbox__type.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/sandbox_type.cc.orig 2023-01-17 19:19:00 UTC +--- sandbox/policy/sandbox_type.cc.orig 2023-03-13 07:33:08 UTC +++ sandbox/policy/sandbox_type.cc -@@ -38,7 +38,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -39,7 +39,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { #endif case Sandbox::kAudio: return false; @@ -9,7 +9,7 @@ case Sandbox::kVideoCapture: return false; #endif -@@ -61,7 +61,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -62,7 +62,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { case Sandbox::kMirroring: case Sandbox::kNaClLoader: #endif @@ -18,7 +18,7 @@ case Sandbox::kHardwareVideoDecoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -71,7 +71,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -72,7 +72,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { case Sandbox::kLibassistant: #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT) #endif // // BUILDFLAG(IS_CHROMEOS_ASH) @@ -27,7 +27,7 @@ case Sandbox::kZygoteIntermediateSandbox: case Sandbox::kHardwareVideoEncoding: #endif -@@ -127,7 +127,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -128,7 +128,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi #endif case Sandbox::kPrintCompositor: case Sandbox::kAudio: @@ -36,9 +36,9 @@ case Sandbox::kVideoCapture: #endif #if BUILDFLAG(IS_WIN) -@@ -138,10 +138,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi - case Sandbox::kMediaFoundationCdm: +@@ -140,10 +140,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kWindowsSystemProxyResolver: + case Sandbox::kFileUtil: #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) @@ -49,7 +49,7 @@ case Sandbox::kHardwareVideoEncoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -169,7 +169,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -171,7 +171,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kNaClLoader: break; #endif // BUILDFLAG(IS_MAC) @@ -58,7 +58,7 @@ case Sandbox::kZygoteIntermediateSandbox: break; #endif -@@ -216,7 +216,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( +@@ -218,7 +218,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( if (process_type == switches::kNaClBrokerProcess) return Sandbox::kNoSandbox; @@ -67,7 +67,7 @@ // Intermediate process gains a sandbox later. if (process_type == switches::kZygoteProcessType) return Sandbox::kZygoteIntermediateSandbox; -@@ -260,7 +260,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -262,7 +262,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb return switches::kUtilitySandbox; case Sandbox::kAudio: return switches::kAudioSandbox; @@ -76,7 +76,7 @@ case Sandbox::kVideoCapture: return switches::kVideoCaptureSandbox; #endif -@@ -290,11 +290,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -292,11 +292,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb case Sandbox::kMirroring: return switches::kMirroringSandbox; #endif @@ -90,7 +90,7 @@ case Sandbox::kHardwareVideoEncoding: return switches::kHardwareVideoEncodingSandbox; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -314,7 +314,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -320,7 +320,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb #if BUILDFLAG(IS_MAC) case Sandbox::kNaClLoader: #endif // BUILDFLAG(IS_MAC) @@ -99,7 +99,7 @@ case Sandbox::kZygoteIntermediateSandbox: #endif NOTREACHED(); -@@ -382,11 +382,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( +@@ -391,11 +391,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( if (sandbox_string == switches::kScreenAISandbox) return Sandbox::kScreenAI; #endif diff --git a/www/iridium/files/patch-sandbox_policy_switches.cc b/www/iridium/files/patch-sandbox_policy_switches.cc index 6a6aa7c0e16d..8a0cadb3b54a 100644 --- a/www/iridium/files/patch-sandbox_policy_switches.cc +++ b/www/iridium/files/patch-sandbox_policy_switches.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/switches.cc.orig 2023-01-17 19:19:00 UTC +--- sandbox/policy/switches.cc.orig 2023-03-13 07:33:08 UTC +++ sandbox/policy/switches.cc -@@ -54,10 +54,10 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro +@@ -54,10 +54,10 @@ const char kFileUtilSandbox[] = "file_util"; const char kMirroringSandbox[] = "mirroring"; #endif // BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-sandbox_policy_switches.h b/www/iridium/files/patch-sandbox_policy_switches.h index 7eab35d375d1..dba28a46aba9 100644 --- a/www/iridium/files/patch-sandbox_policy_switches.h +++ b/www/iridium/files/patch-sandbox_policy_switches.h @@ -1,6 +1,6 @@ ---- sandbox/policy/switches.h.orig 2023-01-17 19:19:00 UTC +--- sandbox/policy/switches.h.orig 2023-03-13 07:33:08 UTC +++ sandbox/policy/switches.h -@@ -56,10 +56,10 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem +@@ -57,10 +57,10 @@ SANDBOX_POLICY_EXPORT extern const char kFileUtilSandb SANDBOX_POLICY_EXPORT extern const char kMirroringSandbox[]; #endif // BUILDFLAG(IS_MAC) @@ -13,7 +13,7 @@ SANDBOX_POLICY_EXPORT extern const char kHardwareVideoEncodingSandbox[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -81,7 +81,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid +@@ -82,7 +82,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_cert__verifier_cert__verifier__creation.cc b/www/iridium/files/patch-services_cert__verifier_cert__verifier__creation.cc index 1dd555c2b90d..3d8c13feec14 100644 --- a/www/iridium/files/patch-services_cert__verifier_cert__verifier__creation.cc +++ b/www/iridium/files/patch-services_cert__verifier_cert__verifier__creation.cc @@ -1,4 +1,4 @@ ---- services/cert_verifier/cert_verifier_creation.cc.orig 2022-12-06 08:09:13 UTC +--- services/cert_verifier/cert_verifier_creation.cc.orig 2023-03-13 07:33:08 UTC +++ services/cert_verifier/cert_verifier_creation.cc @@ -12,7 +12,7 @@ #include "net/cert_net/cert_net_fetcher_url_request.h" @@ -18,7 +18,7 @@ verify_proc = net::CreateCertVerifyProcBuiltin( std::move(cert_net_fetcher), net::CreateSslSystemTrustStore()); #else -@@ -212,6 +212,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr +@@ -219,6 +219,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr bool IsUsingCertNetFetcher() { #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-services_device_geolocation_location__arbitrator.cc b/www/iridium/files/patch-services_device_geolocation_location__arbitrator.cc index 6f103429342e..1ecb2c80167c 100644 --- a/www/iridium/files/patch-services_device_geolocation_location__arbitrator.cc +++ b/www/iridium/files/patch-services_device_geolocation_location__arbitrator.cc @@ -1,6 +1,6 @@ ---- services/device/geolocation/location_arbitrator.cc.orig 2022-03-28 18:11:04 UTC +--- services/device/geolocation/location_arbitrator.cc.orig 2023-03-13 07:33:08 UTC +++ services/device/geolocation/location_arbitrator.cc -@@ -161,7 +161,7 @@ LocationArbitrator::NewNetworkLocationProvider( +@@ -159,7 +159,7 @@ LocationArbitrator::NewNetworkLocationProvider( std::unique_ptr<LocationProvider> LocationArbitrator::NewSystemLocationProvider() { diff --git a/www/iridium/files/patch-services_device_hid_hid__connection__fido.cc b/www/iridium/files/patch-services_device_hid_hid__connection__fido.cc index 84edc22b3cde..e85a5b864985 100644 --- a/www/iridium/files/patch-services_device_hid_hid__connection__fido.cc +++ b/www/iridium/files/patch-services_device_hid_hid__connection__fido.cc @@ -1,6 +1,6 @@ ---- services/device/hid/hid_connection_fido.cc.orig 2022-12-01 10:35:46 UTC +--- services/device/hid/hid_connection_fido.cc.orig 2023-03-13 07:33:08 UTC +++ services/device/hid/hid_connection_fido.cc -@@ -0,0 +1,218 @@ +@@ -0,0 +1,216 @@ +// Copyright 2014 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -14,12 +14,10 @@ +#include <string> +#include <utility> + -+#include "base/bind.h" +#include "base/files/file_descriptor_watcher_posix.h" +#include "base/memory/ref_counted_memory.h" +#include "base/posix/eintr_wrapper.h" +#include "base/threading/scoped_blocking_call.h" -+#include "base/threading/sequenced_task_runner_handle.h" +#include "components/device_event_log/device_event_log.h" +#include "services/device/hid/hid_service.h" + @@ -32,7 +30,7 @@ + base::WeakPtr<HidConnectionFido> connection) + : fd_(std::move(fd)), + connection_(connection), -+ origin_task_runner_(base::SequencedTaskRunnerHandle::Get()) { ++ origin_task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) { + DETACH_FROM_SEQUENCE(sequence_checker_); + // Report buffers must always have room for the report ID. + report_buffer_size_ = device_info->max_input_report_size() + 1; 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 be16331619fa..81bfaaff2b45 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,6 +1,6 @@ ---- services/device/hid/hid_connection_freebsd.cc.orig 2022-10-05 07:34:01 UTC +--- services/device/hid/hid_connection_freebsd.cc.orig 2023-03-13 07:33:08 UTC +++ services/device/hid/hid_connection_freebsd.cc -@@ -0,0 +1,242 @@ +@@ -0,0 +1,240 @@ +// Copyright (c) 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -10,7 +10,6 @@ +#include <dev/usb/usbhid.h> +#include <dev/usb/usb_ioctl.h> + -+#include "base/bind.h" +#include "base/files/file_descriptor_watcher_posix.h" +#include "base/location.h" +#include "base/numerics/safe_math.h" @@ -19,7 +18,6 @@ +#include "base/task/single_thread_task_runner.h" +#include "base/threading/scoped_blocking_call.h" +#include "base/threading/thread_restrictions.h" -+#include "base/threading/thread_task_runner_handle.h" +#include "components/device_event_log/device_event_log.h" +#include "services/device/hid/hid_service.h" + @@ -32,7 +30,7 @@ + base::WeakPtr<HidConnectionFreeBSD> connection) + : fd_(std::move(fd)), + connection_(connection), -+ origin_task_runner_(base::ThreadTaskRunnerHandle::Get()) { ++ origin_task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) { + DETACH_FROM_SEQUENCE(sequence_checker_); + // Report buffers must always have room for the report ID. + report_buffer_size_ = device_info->max_input_report_size() + 1; diff --git a/www/iridium/files/patch-services_device_hid_hid__service__fido.cc b/www/iridium/files/patch-services_device_hid_hid__service__fido.cc index 75f5f7626dc2..af1e4faee15f 100644 --- a/www/iridium/files/patch-services_device_hid_hid__service__fido.cc +++ b/www/iridium/files/patch-services_device_hid_hid__service__fido.cc @@ -1,6 +1,6 @@ ---- services/device/hid/hid_service_fido.cc.orig 2022-12-01 10:35:46 UTC +--- services/device/hid/hid_service_fido.cc.orig 2023-03-13 07:33:08 UTC +++ services/device/hid/hid_service_fido.cc -@@ -0,0 +1,399 @@ +@@ -0,0 +1,396 @@ +// Copyright 2014 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -19,8 +19,6 @@ +#include <string> +#include <utility> + -+#include "base/bind.h" -+#include "base/callback_helpers.h" +#include "base/files/file.h" +#include "base/files/file_path.h" +#include "base/files/file_util.h" @@ -33,7 +31,6 @@ +#include "base/task/sequenced_task_runner.h" +#include "base/task/thread_pool.h" +#include "base/threading/scoped_blocking_call.h" -+#include "base/threading/sequenced_task_runner_handle.h" +#include "build/build_config.h" +#include "build/chromeos_buildflags.h" +#include "components/device_event_log/device_event_log.h" @@ -129,7 +126,7 @@ + allow_protected_reports(allow_protected_reports), + allow_fido_reports(allow_fido_reports), + callback(std::move(callback)), -+ task_runner(base::SequencedTaskRunnerHandle::Get()), ++ task_runner(base::SequencedTaskRunner::GetCurrentDefault()), + blocking_task_runner( + base::ThreadPool::CreateSequencedTaskRunner(kBlockingTaskTraits)) {} + ~ConnectParams() {} @@ -147,7 +144,7 @@ + public: + BlockingTaskRunnerHelper(base::WeakPtr<HidServiceFido> service) + : service_(std::move(service)), -+ task_runner_(base::SequencedTaskRunnerHandle::Get()) { ++ task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) { + DETACH_FROM_SEQUENCE(sequence_checker_); + } + @@ -325,7 +322,7 @@ + + const auto& map_entry = devices().find(device_guid); + if (map_entry == devices().end()) { -+ base::SequencedTaskRunnerHandle::Get()->PostTask( ++ base::SequencedTaskRunner::GetCurrentDefault()->PostTask( + FROM_HERE, base::BindOnce(std::move(callback), nullptr)); + return; + } 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 01a91421f240..650ce2cbedbc 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,6 +1,6 @@ ---- services/device/hid/hid_service_freebsd.cc.orig 2022-10-05 07:34:01 UTC +--- services/device/hid/hid_service_freebsd.cc.orig 2023-03-13 07:33:08 UTC +++ services/device/hid/hid_service_freebsd.cc -@@ -0,0 +1,397 @@ +@@ -0,0 +1,395 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -16,7 +16,6 @@ +#include <string> +#include <vector> + -+#include "base/bind.h" +#include "base/files/file_descriptor_watcher_posix.h" +#include "base/files/file_enumerator.h" +#include "base/files/file_util.h" @@ -33,7 +32,6 @@ +#include "base/task/single_thread_task_runner.h" +#include "base/task/thread_pool.h" +#include "base/threading/scoped_blocking_call.h" -+#include "base/threading/thread_task_runner_handle.h" +#include "base/threading/thread_restrictions.h" +#include "components/device_event_log/device_event_log.h" +#include "services/device/hid/hid_connection_freebsd.h" @@ -51,7 +49,7 @@ + allow_protected_reports(allow_protected_reports), + allow_fido_reports(allow_fido_reports), + callback(std::move(callback)), -+ task_runner(base::ThreadTaskRunnerHandle::Get()), ++ task_runner(base::SequencedTaskRunner::GetCurrentDefault()), + blocking_task_runner( + base::ThreadPool::CreateSequencedTaskRunner(kBlockingTaskTraits)) {} + ~ConnectParams() {} @@ -69,7 +67,7 @@ + public: + BlockingTaskRunnerHelper(base::WeakPtr<HidServiceFreeBSD> service) + : service_(std::move(service)), -+ task_runner_(base::ThreadTaskRunnerHandle::Get()) { ++ task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) { + DETACH_FROM_SEQUENCE(sequence_checker_); + + timer_.reset(new base::RepeatingTimer()); @@ -360,7 +358,7 @@ + + const auto& map_entry = devices().find(device_guid); + if (map_entry == devices().end()) { -+ base::ThreadTaskRunnerHandle::Get()->PostTask( ++ base::SequencedTaskRunner::GetCurrentDefault()->PostTask( + FROM_HERE, base::BindOnce(std::move(callback), nullptr)); + return; + } 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 133508f685e4..48382b279a2e 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 2022-12-06 08:09:13 UTC +--- services/device/public/mojom/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ services/device/public/mojom/BUILD.gn -@@ -88,7 +88,7 @@ mojom("device_service") { +@@ -89,7 +89,7 @@ mojom("device_service") { disable_variants = true enabled_features = [] diff --git a/www/iridium/files/patch-services_device_serial_serial__device__enumerator.cc b/www/iridium/files/patch-services_device_serial_serial__device__enumerator.cc index e5549e4e190d..0a6c07c28980 100644 --- a/www/iridium/files/patch-services_device_serial_serial__device__enumerator.cc +++ b/www/iridium/files/patch-services_device_serial_serial__device__enumerator.cc @@ -1,6 +1,6 @@ ---- services/device/serial/serial_device_enumerator.cc.orig 2022-10-05 07:34:01 UTC +--- services/device/serial/serial_device_enumerator.cc.orig 2023-03-13 07:33:08 UTC +++ services/device/serial/serial_device_enumerator.cc -@@ -11,7 +11,7 @@ +@@ -12,7 +12,7 @@ #include "build/build_config.h" #include "components/device_event_log/device_event_log.h" @@ -9,7 +9,7 @@ #include "services/device/serial/serial_device_enumerator_linux.h" #elif BUILDFLAG(IS_MAC) #include "services/device/serial/serial_device_enumerator_mac.h" -@@ -24,7 +24,7 @@ namespace device { +@@ -25,7 +25,7 @@ namespace device { // static std::unique_ptr<SerialDeviceEnumerator> SerialDeviceEnumerator::Create( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { diff --git a/www/iridium/files/patch-services_device_serial_serial__io__handler__posix.cc b/www/iridium/files/patch-services_device_serial_serial__io__handler__posix.cc index b25f549c0a5a..902eb5032cef 100644 --- a/www/iridium/files/patch-services_device_serial_serial__io__handler__posix.cc +++ b/www/iridium/files/patch-services_device_serial_serial__io__handler__posix.cc @@ -1,6 +1,6 @@ ---- services/device/serial/serial_io_handler_posix.cc.orig 2022-10-05 07:34:01 UTC +--- services/device/serial/serial_io_handler_posix.cc.orig 2023-03-13 07:33:08 UTC +++ services/device/serial/serial_io_handler_posix.cc -@@ -67,7 +67,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee +@@ -68,7 +68,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(19200) BITRATE_TO_SPEED_CASE(38400) diff --git a/www/iridium/files/patch-services_device_usb_usb__service__fake.cc b/www/iridium/files/patch-services_device_usb_usb__service__fake.cc index 24068af0d6cd..603a48247cc7 100644 --- a/www/iridium/files/patch-services_device_usb_usb__service__fake.cc +++ b/www/iridium/files/patch-services_device_usb_usb__service__fake.cc @@ -1,6 +1,6 @@ ---- services/device/usb/usb_service_fake.cc.orig 2022-12-01 10:35:46 UTC +--- services/device/usb/usb_service_fake.cc.orig 2023-03-13 07:33:08 UTC +++ services/device/usb/usb_service_fake.cc -@@ -0,0 +1,51 @@ +@@ -0,0 +1,49 @@ +// Copyright 2014 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -15,8 +15,6 @@ +#include <utility> + +#include "base/barrier_closure.h" -+#include "base/bind.h" -+#include "base/callback_helpers.h" +#include "base/containers/contains.h" +#include "base/location.h" +#include "base/memory/ref_counted_memory.h" @@ -36,7 +34,7 @@ +namespace device { + +UsbServiceImpl::UsbServiceImpl() -+ : task_runner_(base::SequencedTaskRunnerHandle::Get()) { ++ : task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) { + NOTIMPLEMENTED(); +} + diff --git a/www/iridium/files/patch-services_network_BUILD.gn b/www/iridium/files/patch-services_network_BUILD.gn index e880b93cff08..0c9eff0055d2 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 2023-01-17 19:19:00 UTC +--- services/network/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ services/network/BUILD.gn -@@ -336,7 +336,6 @@ if (is_linux || is_chromeos) { +@@ -337,7 +337,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", diff --git a/www/iridium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc b/www/iridium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc new file mode 100644 index 000000000000..b92e085ac1e3 --- /dev/null +++ b/www/iridium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc @@ -0,0 +1,11 @@ +--- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2023-03-13 07:33:08 UTC ++++ services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc +@@ -37,7 +37,7 @@ + #include "third_party/perfetto/protos/perfetto/trace/track_event/process_descriptor.pbzero.h" + #include "third_party/perfetto/protos/perfetto/trace/track_event/thread_descriptor.pbzero.h" + +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) + #include "base/profiler/thread_delegate_posix.h" + #define INITIALIZE_THREAD_DELEGATE_POSIX 1 + #else // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_APPLE) diff --git a/www/iridium/files/patch-services_video__capture_public_mojom_video__capture__service.mojom b/www/iridium/files/patch-services_video__capture_public_mojom_video__capture__service.mojom index deb5266d7c7d..939b812b255b 100644 --- a/www/iridium/files/patch-services_video__capture_public_mojom_video__capture__service.mojom +++ b/www/iridium/files/patch-services_video__capture_public_mojom_video__capture__service.mojom @@ -1,6 +1,6 @@ ---- services/video_capture/public/mojom/video_capture_service.mojom.orig 2022-10-05 07:34:01 UTC +--- services/video_capture/public/mojom/video_capture_service.mojom.orig 2023-03-13 07:33:08 UTC +++ services/video_capture/public/mojom/video_capture_service.mojom -@@ -24,10 +24,10 @@ interface AcceleratorFactory { +@@ -25,10 +25,10 @@ interface AcceleratorFactory { pending_receiver<chromeos_camera.mojom.MjpegDecodeAccelerator> jda); }; diff --git a/www/iridium/files/patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc b/www/iridium/files/patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc new file mode 100644 index 000000000000..7f6df6281858 --- /dev/null +++ b/www/iridium/files/patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc @@ -0,0 +1,16 @@ +--- third_party/abseil-cpp/absl/base/internal/raw_logging.cc.orig 2023-03-13 07:33:08 UTC ++++ third_party/abseil-cpp/absl/base/internal/raw_logging.cc +@@ -52,10 +52,12 @@ + // ABSL_HAVE_SYSCALL_WRITE is defined when the platform provides the syscall + // syscall(SYS_write, /*int*/ fd, /*char* */ buf, /*size_t*/ len); + // for low level operations that want to avoid libc. +-#if (defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && \ ++#if (defined(__linux__) || defined(__FreeBSD__)) && \ + !defined(__ANDROID__) + #include <sys/syscall.h> + #define ABSL_HAVE_SYSCALL_WRITE 1 ++#define ABSL_LOW_LEVEL_WRITE_SUPPORTED 1 ++#elif defined(__OpenBSD__) + #define ABSL_LOW_LEVEL_WRITE_SUPPORTED 1 + #else + #undef ABSL_HAVE_SYSCALL_WRITE diff --git a/www/iridium/files/patch-third__party_angle_BUILD.gn b/www/iridium/files/patch-third__party_angle_BUILD.gn index 35f3ec732901..7f2723e05575 100644 --- a/www/iridium/files/patch-third__party_angle_BUILD.gn +++ b/www/iridium/files/patch-third__party_angle_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/BUILD.gn.orig 2023-01-17 19:19:00 UTC +--- third_party/angle/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ third_party/angle/BUILD.gn -@@ -276,7 +276,6 @@ config("extra_warnings") { +@@ -280,7 +280,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,16 +8,16 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -459,7 +458,7 @@ angle_static_library("angle_common") { - all_dependent_configs = [ ":angle_disable_pool_alloc" ] - } +@@ -464,7 +463,7 @@ template("angle_common_lib") { + all_dependent_configs = [ ":angle_disable_pool_alloc" ] + } -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - libs = [ "dl" ] - } +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + libs = [ "dl" ] + } -@@ -601,6 +600,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -619,6 +618,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] @@ -27,21 +27,3 @@ } if (angle_use_wayland && angle_has_build) { -@@ -1104,12 +1106,12 @@ if (angle_use_wayland) { - "wayland-client", - "wayland-egl", - ] -+ } else { -+ include_dirs = [ -+ "$wayland_dir/egl", -+ "$wayland_dir/src", -+ ] - } -- -- include_dirs = [ -- "$wayland_dir/egl", -- "$wayland_dir/src", -- ] - } - - group("angle_wayland") { diff --git a/www/iridium/files/patch-third__party_angle_src_common_vulkan_BUILD.gn b/www/iridium/files/patch-third__party_angle_src_common_vulkan_BUILD.gn deleted file mode 100644 index 00ffd4d96e58..000000000000 --- a/www/iridium/files/patch-third__party_angle_src_common_vulkan_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/angle/src/common/vulkan/BUILD.gn.orig 2022-10-05 07:34:01 UTC -+++ third_party/angle/src/common/vulkan/BUILD.gn -@@ -33,7 +33,7 @@ if (angle_enable_vulkan || angle_build_vulkan_system_i - if (angle_shared_libvulkan) { - defines = [ "ANGLE_SHARED_LIBVULKAN=1" ] - } -- if (angle_use_wayland) { -+ if (angle_use_wayland && !use_system_libwayland) { - include_dirs = [ "$wayland_dir/src" ] - } - configs = [ "$angle_root:angle_vulkan_wayland_config" ] diff --git a/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp index 319b3aa233b1..294ec884829c 100644 --- a/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,4 +1,4 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2023-01-17 19:19:00 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2023-03-13 07:33:08 UTC +++ third_party/angle/src/libANGLE/Display.cpp @@ -55,7 +55,7 @@ # include "libANGLE/renderer/gl/wgl/DisplayWGL.h" @@ -7,9 +7,9 @@ -# 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_GBM) - # include "libANGLE/renderer/gl/egl/gbm/DisplayGbm.h" -@@ -346,7 +346,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di + # if defined(ANGLE_USE_X11) + # include "libANGLE/renderer/gl/glx/DisplayGLX.h" +@@ -343,7 +343,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateDisplayCGLOrEAGL(state); break; @@ -18,7 +18,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -389,7 +389,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -384,7 +384,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di #if defined(ANGLE_ENABLE_OPENGL) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayWGL(state); @@ -27,7 +27,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0 || platformType == EGL_PLATFORM_VULKAN_DISPLAY_MODE_HEADLESS_ANGLE) -@@ -440,7 +440,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -433,7 +433,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateVulkanWin32Display(state); } break; @@ -36,7 +36,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable()) { -@@ -2042,7 +2042,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2038,7 +2038,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h b/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h index ad340ae21685..faa81489b018 100644 --- a/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h +++ b/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2022-12-01 10:35:46 UTC +--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2023-03-13 07:33:08 UTC +++ third_party/angle/src/libANGLE/renderer/driver_utils.h -@@ -200,7 +200,7 @@ inline bool IsWindows() +@@ -206,7 +206,7 @@ inline bool IsWindows() inline bool IsLinux() { diff --git a/www/iridium/files/patch-third__party_angle_src_third__party_volk_BUILD.gn b/www/iridium/files/patch-third__party_angle_src_third__party_volk_BUILD.gn deleted file mode 100644 index 3e4f7543bb0f..000000000000 --- a/www/iridium/files/patch-third__party_angle_src_third__party_volk_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/angle/src/third_party/volk/BUILD.gn.orig 2022-10-05 07:34:01 UTC -+++ third_party/angle/src/third_party/volk/BUILD.gn -@@ -20,7 +20,7 @@ source_set("volk") { - public_configs = [ ":volk_config" ] - configs += [ "$angle_root:angle_no_cfi_icall" ] - public_deps = [ "$angle_vulkan_headers_dir:vulkan_headers" ] -- if (angle_use_wayland) { -+ if (angle_use_wayland && !use_system_libwayland) { - include_dirs = [ "$wayland_dir/src" ] - } - } diff --git a/www/iridium/files/patch-third__party_angle_util_BUILD.gn b/www/iridium/files/patch-third__party_angle_util_BUILD.gn index 92edece38949..9a0d11ac51cc 100644 --- a/www/iridium/files/patch-third__party_angle_util_BUILD.gn +++ b/www/iridium/files/patch-third__party_angle_util_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/util/BUILD.gn.orig 2023-01-17 19:19:00 UTC +--- third_party/angle/util/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ third_party/angle/util/BUILD.gn -@@ -271,7 +271,7 @@ foreach(is_shared_library, +@@ -292,7 +292,7 @@ foreach(is_shared_library, ] libs = [] diff --git a/www/iridium/files/patch-third__party_blink_common_features.cc b/www/iridium/files/patch-third__party_blink_common_features.cc deleted file mode 100644 index d77c7e3e4f7d..000000000000 --- a/www/iridium/files/patch-third__party_blink_common_features.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- third_party/blink/common/features.cc.orig 2023-01-17 19:19:00 UTC -+++ third_party/blink/common/features.cc -@@ -1757,9 +1757,10 @@ BASE_FEATURE(kSplitUserMediaQueues, - "SplitUserMediaQueues", - base::FEATURE_DISABLED_BY_DEFAULT); - -+// XXX https://crbug.com/1382032 - BASE_FEATURE(kTextCodecCJKEnabled, - "TextCodecCJKEnabled", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ base::FEATURE_DISABLED_BY_DEFAULT); - - } // namespace features - } // namespace blink 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 2ec222b275a5..7e93a0f1c431 100644 --- a/www/iridium/files/patch-third__party_blink_public_platform_platform.h +++ b/www/iridium/files/patch-third__party_blink_public_platform_platform.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/platform/platform.h.orig 2023-01-17 19:19:00 UTC +--- third_party/blink/public/platform/platform.h.orig 2023-03-13 07:33:08 UTC +++ third_party/blink/public/platform/platform.h -@@ -351,7 +351,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -357,7 +357,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; } diff --git a/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc index 04b20647680a..91aa79816444 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc @@ -1,7 +1,7 @@ ---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2023-01-17 19:19:00 UTC +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2023-03-13 07:33:08 UTC +++ third_party/blink/renderer/controller/blink_initializer.cc @@ -73,12 +73,12 @@ - #include "third_party/blink/renderer/controller/oom_intervention_impl.h" + #include "third_party/blink/renderer/controller/private_memory_footprint_provider.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -15,7 +15,7 @@ #include "third_party/blink/renderer/controller/highest_pmf_reporter.h" #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h" #endif -@@ -226,7 +226,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder +@@ -208,7 +208,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder main_thread_task_runner); #endif @@ -24,7 +24,7 @@ binders.Add<mojom::blink::MemoryUsageMonitorLinux>( ConvertToBaseRepeatingCallback( CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)), -@@ -259,7 +259,7 @@ void BlinkInitializer::RegisterMemoryWatchers() { +@@ -241,7 +241,7 @@ void BlinkInitializer::RegisterMemoryWatchers() { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc b/www/iridium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc index c32fbda9ec0a..2e2a5b1cf4cb 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2023-03-13 07:33:08 UTC +++ third_party/blink/renderer/core/editing/editing_behavior.cc -@@ -280,7 +280,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb +@@ -281,7 +281,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb // unexpected behaviour if (ch < ' ') return false; 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 b1ca8ab3b300..203666bbad17 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-12-06 08:09:13 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-03-13 07:33:08 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -408,7 +408,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( +@@ -407,7 +407,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3278,7 +3278,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3295,7 +3295,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs renderer_preferences_.use_subpixel_positioning); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc index 52408ec72778..499640d3b281 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2023-01-17 19:19:00 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2023-03-13 07:33:08 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6449,7 +6449,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6452,7 +6452,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { MoveCaretStaysHorizontallyAlignedWhenMoved #endif // TODO(crbug.com/1317375): Build these tests on all platforms. @@ -9,7 +9,7 @@ TEST_F(WebFrameTest, MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved) { RegisterMockedHttpURLLoad("move_caret.html"); -@@ -6846,7 +6846,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc +@@ -6849,7 +6849,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) { RunTest("composited_selection_bounds_large_selection_noscroll.html"); } diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc index 427bc0b6d6e8..aa8feab8d2d8 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2023-01-17 19:19:00 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2023-03-13 07:33:08 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -113,7 +113,7 @@ namespace blink { +@@ -114,7 +114,7 @@ namespace blink { namespace { diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc index 731134e8c1bd..74a67f8afa44 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2023-01-17 19:19:00 UTC +--- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2023-03-13 07:33:08 UTC +++ third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc -@@ -114,7 +114,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount +@@ -174,7 +174,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount ~SharedXnnpackContext() { base::AutoLock auto_lock(SharedXnnpackContextLock()); diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc index e7bcc20ec33b..341a62c60323 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2022-12-06 08:09:13 UTC +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2023-03-13 07:33:08 UTC +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -278,7 +278,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar +@@ -290,7 +290,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar SetupRenderer(kDefaultOutputDeviceId); renderer_proxy_->Start(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/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 c67753c96f96..7b593b84277e 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 2023-01-17 19:19:00 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2023-03-13 07:33:08 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6155,7 +6155,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6231,7 +6231,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 new file mode 100644 index 000000000000..94bb21aee35b --- /dev/null +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc @@ -0,0 +1,11 @@ +--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2023-03-13 07:33:08 UTC ++++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc +@@ -699,7 +699,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( + // TODO(crbug.com/1309194): GPU-GPU copy on linux platform requires interop + // supported. According to the bug, this change will be a long time task. + // So disable GPU-GPU copy path on linux platform. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + unaccelerated_image = image->MakeUnaccelerated(); + image = unaccelerated_image.get(); + #endif // BUILDFLAG(IS_LINUX) 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 18f711a81907..4aee94bb69a3 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 2023-01-17 19:19:00 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -1898,7 +1898,7 @@ static_library("test_support") { +@@ -1924,7 +1924,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 e461ada27fa4..da8f255e3e5f 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,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2022-12-06 08:09:13 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2023-03-13 07:33:08 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc @@ -72,7 +72,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo @@ -9,7 +9,7 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -139,7 +139,7 @@ FontCache::~FontCache() { +@@ -118,7 +118,7 @@ FontCache::~FontCache() = default; FontPlatformData* FontCache::SystemFontPlatformData( const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index 5578d6b81c67..d2c36534623d 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2022-12-06 08:09:13 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2023-03-13 07:33:08 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h @@ -57,7 +57,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" @@ -9,7 +9,7 @@ #include "ui/gfx/font_fallback_linux.h" #endif -@@ -181,7 +181,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -180,7 +180,7 @@ class PLATFORM_EXPORT FontCache final { static void PrewarmFamily(const AtomicString& family_name) {} #endif @@ -18,7 +18,7 @@ // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } -@@ -265,7 +265,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -264,7 +264,7 @@ class PLATFORM_EXPORT FontCache final { const char* locale_family_name); #endif // BUILDFLAG(IS_ANDROID) @@ -27,7 +27,7 @@ static bool GetFontForCharacter(UChar32, const char* preferred_locale, gfx::FallbackFontData*); -@@ -345,7 +345,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -344,7 +344,7 @@ class PLATFORM_EXPORT FontCache final { const FontFaceCreationParams&, std::string& name); diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc index 99e08cd235ba..d93322dce663 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2022-10-05 07:34:01 UTC +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2023-03-13 07:33:08 UTC +++ third_party/blink/renderer/platform/fonts/font_description.cc @@ -39,7 +39,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -270,7 +270,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -275,7 +275,7 @@ FontCacheKey FontDescription::CacheKey( static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc index 6a4121b6b0c1..a17603cfe4f7 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig 2022-12-06 08:09:13 UTC +--- third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig 2023-03-13 07:33:08 UTC +++ third_party/blink/renderer/platform/fonts/font_platform_data.cc @@ -48,7 +48,7 @@ namespace blink { @@ -9,7 +9,7 @@ // Getting the system font render style takes a significant amount of time on // Linux because looking up fonts using fontconfig can be very slow. We fetch // the render style for each font family and text size, while it's very -@@ -123,7 +123,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t +@@ -127,7 +127,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t style_ = WebFontRenderStyle::GetDefault(); #if !BUILDFLAG(IS_WIN) WebFontRenderStyle system_style; diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc index 4ec4e0b677d2..bcd04e5c63c2 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,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2022-04-01 07:48:30 UTC +--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2023-03-13 07:33:08 UTC +++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc @@ -60,7 +60,7 @@ AtomicString ToAtomicString(const SkString& str) { return AtomicString::FromUTF8(str.c_str(), str.size()); @@ -9,7 +9,7 @@ // This function is called on android or when we are emulating android fonts on // linux and the embedder has overriden the default fontManager with // WebFontRendering::setSkiaFontMgr. -@@ -236,7 +236,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface( +@@ -235,7 +235,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface( } #endif @@ -18,7 +18,7 @@ // On linux if the fontManager has been overridden then we should be calling // the embedder provided font Manager rather than calling // SkTypeface::CreateFromName which may redirect the call to the default font -@@ -263,7 +263,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon +@@ -262,7 +262,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon std::string name; sk_sp<SkTypeface> typeface; 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 d4e0f0124c88..1d93fe17aae0 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2022-12-01 10:35:46 UTC +--- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2023-03-13 07:33:08 UTC +++ third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc -@@ -174,12 +174,12 @@ SupportedFormats GetSupportedFormatsInternal( +@@ -197,12 +197,12 @@ SupportedFormats GetSupportedFormatsInternal( supported_formats.scalability_modes.push_back(profile.scalability_modes); supported_formats.sdp_formats.push_back(std::move(*format)); @@ -8,7 +8,7 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #if BUILDFLAG(IS_WIN) const bool kShouldAddH264Cbp = - media::IsMediaFoundationH264CbpEncodingEnabled() && + base::FeatureList::IsEnabled(kMediaFoundationH264CbpEncoding) && profile.profile == media::VideoCodecProfile::H264PROFILE_BASELINE; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 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 7db30ada1100..f40089326833 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 2023-01-17 19:19:00 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-03-13 07:33:08 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1255,7 +1255,7 @@ +@@ -1347,7 +1347,7 @@ depends_on: ["FileSystemAccessLocal"], status: {"Android": "test", "default": "stable"}, origin_trial_feature_name: "FileHandling", @@ -9,7 +9,7 @@ base_feature: "FileHandlingAPI", }, { -@@ -2802,7 +2802,7 @@ +@@ -2924,7 +2924,7 @@ { name: "UnrestrictedSharedArrayBuffer", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -18,7 +18,7 @@ }, { name: "URLPatternCompareComponent", -@@ -2822,7 +2822,7 @@ +@@ -2944,7 +2944,7 @@ origin_trial_feature_name: "UserAgentReduction", origin_trial_allows_third_party: true, // iOS not included as it should not send a reduced User-Agent string. @@ -27,7 +27,7 @@ base_feature: "ReduceUserAgent", }, { -@@ -2984,12 +2984,12 @@ +@@ -3107,12 +3107,12 @@ name: "WebAppUrlHandling", status: "experimental", origin_trial_feature_name: "WebAppUrlHandling", @@ -41,4 +41,4 @@ + origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], status: "stable", }, - // WebAuth is disabled on Android versions prior to N (7.0) due to lack of + { diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc index bdae4dc02d8d..3dfd10c8b403 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc.orig 2022-12-06 08:09:13 UTC +--- third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc.orig 2023-03-13 07:33:08 UTC +++ third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc -@@ -241,7 +241,7 @@ void CategorizedWorkerPoolImpl::Start(int max_concurre +@@ -242,7 +242,7 @@ void CategorizedWorkerPoolImpl::Start(int max_concurre "CompositorTileWorkerBackground", thread_options, this, background_thread_prio_categories, &has_task_for_background_priority_thread_cv_); 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 3f076ecc688e..be04ad37d747 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 2022-04-01 07:48:30 UTC +--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2023-03-13 07:33:08 UTC +++ third_party/blink/renderer/platform/wtf/stack_util.cc @@ -18,6 +18,11 @@ extern "C" void* __libc_stack_end; // NOLINT @@ -18,10 +18,10 @@ return 512 * 1024; +#elif BUILDFLAG(IS_OPENBSD) + return 512 * 1024; - #elif BUILDFLAG(IS_MAC) + #elif BUILDFLAG(IS_APPLE) // pthread_get_stacksize_np() returns too low a value for the main thread on // OSX 10.9, -@@ -147,6 +154,13 @@ void* GetStackStart() { +@@ -148,6 +155,13 @@ void* GetStackStart() { ::GetCurrentThreadStackLimits(&lowLimit, &highLimit); return reinterpret_cast<void*>(highLimit); #endif diff --git a/www/iridium/files/patch-third__party_boringssl_BUILD.generated.gni b/www/iridium/files/patch-third__party_boringssl_BUILD.generated.gni index 1c18a31ccf0a..f8546c3c4f68 100644 --- a/www/iridium/files/patch-third__party_boringssl_BUILD.generated.gni +++ b/www/iridium/files/patch-third__party_boringssl_BUILD.generated.gni @@ -1,13 +1,13 @@ ---- third_party/boringssl/BUILD.generated.gni.orig 2022-10-05 07:34:01 UTC +--- third_party/boringssl/BUILD.generated.gni.orig 2023-03-13 07:33:08 UTC +++ third_party/boringssl/BUILD.generated.gni -@@ -78,6 +78,7 @@ crypto_sources = [ - "src/crypto/cpu_aarch64_apple.c", +@@ -77,6 +77,7 @@ crypto_sources = [ + "src/crypto/cpu_aarch64_freebsd.c", "src/crypto/cpu_aarch64_fuchsia.c", "src/crypto/cpu_aarch64_linux.c", + "src/crypto/cpu_aarch64_openbsd.c", "src/crypto/cpu_aarch64_win.c", "src/crypto/cpu_arm.c", - "src/crypto/cpu_arm_linux.c", + "src/crypto/cpu_arm_freebsd.c", @@ -184,6 +185,7 @@ crypto_sources = [ "src/crypto/rand_extra/deterministic.c", "src/crypto/rand_extra/forkunsafe.c", diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl new file mode 100644 index 000000000000..9ec9ae40996b --- /dev/null +++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl @@ -0,0 +1,18 @@ +--- third_party/boringssl/src/crypto/chacha/asm/chacha-x86_64.pl.orig 2023-03-13 07:33:08 UTC ++++ third_party/boringssl/src/crypto/chacha/asm/chacha-x86_64.pl +@@ -78,6 +78,7 @@ $code.=<<___; + + .extern OPENSSL_ia32cap_P + ++.rodata + .align 64 + .Lzero: + .long 0,0,0,0 +@@ -107,6 +108,7 @@ $code.=<<___; + .Lsixteen: + .long 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16 + .asciz "ChaCha20 for x86_64, CRYPTOGAMS by <appro\@openssl.org>" ++.previous + ___ + + sub AUTOLOAD() # thunk [simplified] 32-bit style perlasm diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl new file mode 100644 index 000000000000..d97bdfec2d00 --- /dev/null +++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl @@ -0,0 +1,19 @@ +--- third_party/boringssl/src/crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl.orig 2023-03-13 07:33:08 UTC ++++ third_party/boringssl/src/crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl +@@ -32,7 +32,7 @@ open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\""; + *STDOUT=*OUT; + + $code.=<<___; +-.data ++.rodata + + .align 16 + one: +@@ -66,6 +66,7 @@ con3: + .byte -1,-1,-1,-1,-1,-1,-1,-1,4,5,6,7,4,5,6,7 + and_mask: + .long 0,0xffffffff, 0xffffffff, 0xffffffff ++.previous + ___ + + $code.=<<___; diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl new file mode 100644 index 000000000000..fb539238f310 --- /dev/null +++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl @@ -0,0 +1,18 @@ +--- third_party/boringssl/src/crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl.orig 2023-03-13 07:33:08 UTC ++++ third_party/boringssl/src/crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl +@@ -42,6 +42,7 @@ $code.=<<___; + + chacha20_poly1305_constants: + ++.rodata + .align 64 + .Lchacha20_consts: + .byte 'e','x','p','a','n','d',' ','3','2','-','b','y','t','e',' ','k' +@@ -79,6 +80,7 @@ chacha20_poly1305_constants: + .byte 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00 + .byte 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00 + .byte 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff ++.previous + ___ + + my ($oup,$inp,$inl,$adp,$keyp,$itr1,$itr2,$adl)=("%rdi","%rsi","%rbx","%rcx","%r9","%rcx","%r8","%r8"); diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl new file mode 100644 index 000000000000..af6ab803bd34 --- /dev/null +++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl @@ -0,0 +1,18 @@ +--- third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl.orig 2023-03-13 07:33:08 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl +@@ -4727,6 +4727,7 @@ ___ + } + + $code.=<<___; ++.rodata + .align 64 + .Lbswap_mask: + .byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0 +@@ -4749,6 +4750,7 @@ $code.=<<___; + + .asciz "AES for Intel AES-NI, CRYPTOGAMS by <appro\@openssl.org>" + .align 64 ++.previous + ___ + + # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame, diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl new file mode 100644 index 000000000000..56f81ff1dda9 --- /dev/null +++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl @@ -0,0 +1,10 @@ +--- third_party/boringssl/src/crypto/fipsmodule/aes/asm/vpaes-x86_64.pl.orig 2023-03-13 07:33:08 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/aes/asm/vpaes-x86_64.pl +@@ -1288,6 +1288,7 @@ _vpaes_preheat: + ## ## + ######################################################## + .type _vpaes_consts,\@object ++.rodata + .align 64 + _vpaes_consts: + .Lk_inv: # inv, inva diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl new file mode 100644 index 000000000000..e3996e30abd8 --- /dev/null +++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl @@ -0,0 +1,16 @@ +--- third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont5.pl.orig 2023-03-13 07:33:08 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont5.pl +@@ -3576,11 +3576,13 @@ $code.=<<___; + ___ + } + $code.=<<___; ++.rodata + .align 64 + .Linc: + .long 0,0, 1,1 + .long 2,2, 2,2 + .asciz "Montgomery Multiplication with scatter/gather for x86_64, CRYPTOGAMS by <appro\@openssl.org>" ++.previous + ___ + + # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame, diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl new file mode 100644 index 000000000000..91ede4d298c4 --- /dev/null +++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl @@ -0,0 +1,18 @@ +--- third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl.orig 2023-03-13 07:33:08 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl +@@ -62,6 +62,7 @@ $code.=<<___; + .extern OPENSSL_ia32cap_P + + # The polynomial ++.rodata + .align 64 + .Lpoly: + .quad 0xffffffffffffffff, 0x00000000ffffffff, 0x0000000000000000, 0xffffffff00000001 +@@ -80,6 +81,7 @@ $code.=<<___; + .quad 0xf3b9cac2fc632551, 0xbce6faada7179e84, 0xffffffffffffffff, 0xffffffff00000000 + .LordK: + .quad 0xccd1c8aaee00bc4f ++.previous + ___ + + { diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl new file mode 100644 index 000000000000..4fd7d8fe8b3e --- /dev/null +++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl @@ -0,0 +1,18 @@ +--- third_party/boringssl/src/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl.orig 2023-03-13 07:33:08 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl +@@ -985,6 +985,7 @@ $code.=<<___; + ___ + + $code.=<<___; ++.rodata + .align 64 + .Lbswap_mask: + .byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0 +@@ -998,6 +999,7 @@ $code.=<<___; + .byte 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + .asciz "AES-NI GCM module for x86_64, CRYPTOGAMS by <appro\@openssl.org>" + .align 64 ++.previous + ___ + if ($win64) { + $rec="%rcx"; diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl new file mode 100644 index 000000000000..083ae3b02b61 --- /dev/null +++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl @@ -0,0 +1,18 @@ +--- third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl.orig 2023-03-13 07:33:08 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl +@@ -333,6 +333,7 @@ $code .= <<____; + .cfi_endproc + .size gcm_ghash_ssse3,.-gcm_ghash_ssse3 + ++.rodata + .align 16 + # .Lreverse_bytes is a permutation which, if applied with pshufb, reverses the + # bytes in an XMM register. +@@ -341,6 +342,7 @@ $code .= <<____; + # .Llow4_mask is an XMM mask which selects the low four bits of each byte. + .Llow4_mask: + .quad 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f ++.previous + ____ + + if ($win64) { diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl new file mode 100644 index 000000000000..56c02dada022 --- /dev/null +++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl @@ -0,0 +1,18 @@ +--- third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-x86_64.pl.orig 2023-03-13 07:33:08 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-x86_64.pl +@@ -1275,6 +1275,7 @@ ___ + } + + $code.=<<___; ++.rodata + .align 64 + .Lbswap_mask: + .byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0 +@@ -1286,6 +1287,7 @@ $code.=<<___; + + .asciz "GHASH for x86_64, CRYPTOGAMS by <appro\@openssl.org>" + .align 64 ++.previous + ___ + + if ($win64) { diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86__64.pl new file mode 100644 index 000000000000..eb0f841ed159 --- /dev/null +++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86__64.pl @@ -0,0 +1,18 @@ +--- third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha1-x86_64.pl.orig 2023-03-13 07:33:08 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha1-x86_64.pl +@@ -1815,6 +1815,7 @@ ___ + } + } + $code.=<<___; ++.rodata + .align 64 + K_XX_XX: + .long 0x5a827999,0x5a827999,0x5a827999,0x5a827999 # K_00_19 +@@ -1833,6 +1834,7 @@ ___ + $code.=<<___; + .asciz "SHA1 block transform for x86_64, CRYPTOGAMS by <appro\@openssl.org>" + .align 64 ++.previous + ___ + + # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame, diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86__64.pl new file mode 100644 index 000000000000..feb8d010c3d0 --- /dev/null +++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86__64.pl @@ -0,0 +1,30 @@ +--- third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha512-x86_64.pl.orig 2023-03-13 07:33:08 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha512-x86_64.pl +@@ -404,6 +404,7 @@ ___ + + if ($SZ==4) { + $code.=<<___; ++.rodata + .align 64 + .type $TABLE,\@object + $TABLE: +@@ -447,9 +448,11 @@ $TABLE: + .long 0xffffffff,0xffffffff,0x03020100,0x0b0a0908 + .long 0xffffffff,0xffffffff,0x03020100,0x0b0a0908 + .asciz "SHA256 block transform for x86_64, CRYPTOGAMS by <appro\@openssl.org>" ++.previous + ___ + } else { + $code.=<<___; ++.rodata + .align 64 + .type $TABLE,\@object + $TABLE: +@@ -537,6 +540,7 @@ $TABLE: + .quad 0x0001020304050607,0x08090a0b0c0d0e0f + .quad 0x0001020304050607,0x08090a0b0c0d0e0f + .asciz "SHA512 block transform for x86_64, CRYPTOGAMS by <appro\@openssl.org>" ++.previous + ___ + } + diff --git a/www/iridium/files/patch-third__party_boringssl_src_util_generate__build__files.py b/www/iridium/files/patch-third__party_boringssl_src_util_generate__build__files.py new file mode 100644 index 000000000000..f6613e454cec --- /dev/null +++ b/www/iridium/files/patch-third__party_boringssl_src_util_generate__build__files.py @@ -0,0 +1,34 @@ +--- third_party/boringssl/src/util/generate_build_files.py.orig 2023-03-13 07:33:08 UTC ++++ third_party/boringssl/src/util/generate_build_files.py +@@ -859,10 +859,10 @@ def main(platforms): + ] + + # Generate err_data.c +- with open('err_data.c', 'w+') as err_data: +- subprocess.check_call(['go', 'run', 'err_data_generate.go'], +- cwd=os.path.join('src', 'crypto', 'err'), +- stdout=err_data) ++# with open('err_data.c', 'w+') as err_data: ++# subprocess.check_call(['go', 'run', 'err_data_generate.go'], ++# cwd=os.path.join('src', 'crypto', 'err'), ++# stdout=err_data) + crypto_c_files.append('err_data.c') + crypto_c_files.sort() + +@@ -875,11 +875,11 @@ def main(platforms): + crypto_test_files = [] + if EMBED_TEST_DATA: + # Generate crypto_test_data.cc +- with open('crypto_test_data.cc', 'w+') as out: +- subprocess.check_call( +- ['go', 'run', 'util/embed_test_data.go'] + cmake['CRYPTO_TEST_DATA'], +- cwd='src', +- stdout=out) ++# with open('crypto_test_data.cc', 'w+') as out: ++# subprocess.check_call( ++# ['go', 'run', 'util/embed_test_data.go'] + cmake['CRYPTO_TEST_DATA'], ++# cwd='src', ++# stdout=out) + crypto_test_files += ['crypto_test_data.cc'] + + crypto_test_files += FindCFiles(os.path.join('src', 'crypto'), OnlyTests) diff --git a/www/iridium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni b/www/iridium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni index feda33c24dce..05a9a370defd 100644 --- a/www/iridium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni +++ b/www/iridium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig 2022-03-28 18:11:04 UTC +--- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig 2023-03-13 07:33:08 UTC +++ third_party/crashpad/crashpad/build/crashpad_buildconfig.gni -@@ -58,7 +58,7 @@ if (crashpad_is_in_chromium) { +@@ -60,7 +60,7 @@ if (crashpad_is_in_chromium) { crashpad_is_mac = is_mac crashpad_is_ios = is_ios crashpad_is_win = is_win diff --git a/www/iridium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn b/www/iridium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn index 7c309655f4b9..150337dd0d57 100644 --- a/www/iridium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn +++ b/www/iridium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/client/BUILD.gn.orig 2023-01-17 19:19:00 UTC +--- third_party/crashpad/crashpad/client/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ third_party/crashpad/crashpad/client/BUILD.gn -@@ -131,6 +131,13 @@ static_library("common") { +@@ -132,6 +132,13 @@ static_library("common") { if (crashpad_is_win) { sources += [ "crash_report_database_win.cc" ] } diff --git a/www/iridium/files/patch-third__party_distributed__point__functions_BUILD.gn b/www/iridium/files/patch-third__party_distributed__point__functions_BUILD.gn new file mode 100644 index 000000000000..274fa5445432 --- /dev/null +++ b/www/iridium/files/patch-third__party_distributed__point__functions_BUILD.gn @@ -0,0 +1,12 @@ +--- third_party/distributed_point_functions/BUILD.gn.orig 2023-03-13 07:33:08 UTC ++++ third_party/distributed_point_functions/BUILD.gn +@@ -61,6 +61,9 @@ source_set("distributed_point_functions") { + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + ++ # XXX clang13 crashes with optimizations ++ configs += [ "//build/config/compiler:no_optimize" ] ++ + public_configs = [ ":distributed_point_functions_includes" ] + } + diff --git a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h index 57205309c744..9dacd10acd81 100644 --- a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h +++ b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h @@ -1,10 +1,10 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h.orig 2022-10-05 07:34:01 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h.orig 2023-03-13 07:33:08 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h -@@ -0,0 +1,737 @@ +@@ -0,0 +1,748 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_H +#define FFMPEG_CONFIG_H -+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/d/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ ++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +#define FFMPEG_LICENSE "LGPL version 2.1 or later" +#define CONFIG_THIS_YEAR 2022 +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -60,6 +60,7 @@ +#define HAVE_POWER8 0 +#define HAVE_PPC4XX 0 +#define HAVE_VSX 0 ++#define HAVE_RVV 0 +#define HAVE_AESNI 0 +#define HAVE_AMD3DNOW 0 +#define HAVE_AMD3DNOWEXT 0 @@ -108,6 +109,7 @@ +#define HAVE_POWER8_EXTERNAL 0 +#define HAVE_PPC4XX_EXTERNAL 0 +#define HAVE_VSX_EXTERNAL 0 ++#define HAVE_RVV_EXTERNAL 0 +#define HAVE_AESNI_EXTERNAL 0 +#define HAVE_AMD3DNOW_EXTERNAL 0 +#define HAVE_AMD3DNOWEXT_EXTERNAL 0 @@ -156,6 +158,7 @@ +#define HAVE_POWER8_INLINE 0 +#define HAVE_PPC4XX_INLINE 0 +#define HAVE_VSX_INLINE 0 ++#define HAVE_RVV_INLINE 0 +#define HAVE_AESNI_INLINE 0 +#define HAVE_AMD3DNOW_INLINE 0 +#define HAVE_AMD3DNOWEXT_INLINE 0 @@ -194,6 +197,7 @@ +#define HAVE_FAST_64BIT 1 +#define HAVE_FAST_CLZ 1 +#define HAVE_FAST_CMOV 0 ++#define HAVE_FAST_FLOAT16 1 +#define HAVE_LOCAL_ALIGNED 0 +#define HAVE_SIMD_ALIGN_16 1 +#define HAVE_SIMD_ALIGN_32 0 @@ -297,6 +301,7 @@ +#define HAVE_FCNTL 1 +#define HAVE_GETADDRINFO 0 +#define HAVE_GETAUXVAL 0 ++#define HAVE_GETENV 1 +#define HAVE_GETHRTIME 0 +#define HAVE_GETOPT 1 +#define HAVE_GETMODULEHANDLE 0 @@ -325,6 +330,7 @@ +#define HAVE_NANOSLEEP 1 +#define HAVE_PEEKNAMEDPIPE 0 +#define HAVE_POSIX_MEMALIGN 1 ++#define HAVE_PRCTL 0 /* #define HAVE_PRCTL 1 -- forced to 0 for Fuchsia */ +#define HAVE_PTHREAD_CANCEL 1 +#define HAVE_SCHED_GETAFFINITY 0 +#define HAVE_SECITEMIMPORT 0 @@ -370,6 +376,8 @@ +/* #define HAVE_VFP_ARGS 0 -- softfp/hardfp selection is done by the chrome build */ +#define HAVE_XFORM_ASM 0 +#define HAVE_XMM_CLOBBERS 0 ++#define HAVE_DPI_AWARENESS_CONTEXT 0 ++#define HAVE_IDXGIOUTPUT5 0 +#define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0 +#define HAVE_KCMVIDEOCODECTYPE_VP9 0 @@ -472,6 +480,7 @@ +#define CONFIG_GNUTLS 0 +#define CONFIG_JNI 0 +#define CONFIG_LADSPA 0 ++#define CONFIG_LCMS2 0 +#define CONFIG_LIBAOM 0 +#define CONFIG_LIBASS 0 +#define CONFIG_LIBBLURAY 0 @@ -492,6 +501,7 @@ +#define CONFIG_LIBIEC61883 0 +#define CONFIG_LIBILBC 0 +#define CONFIG_LIBJACK 0 ++#define CONFIG_LIBJXL 0 +#define CONFIG_LIBKLVANC 0 +#define CONFIG_LIBKVAZAAR 0 +#define CONFIG_LIBMODPLUG 0 @@ -563,6 +573,7 @@ +#define CONFIG_CUDA_SDK 0 +#define CONFIG_LIBNPP 0 +#define CONFIG_LIBMFX 0 ++#define CONFIG_LIBVPL 0 +#define CONFIG_MMAL 0 +#define CONFIG_OMX 0 +#define CONFIG_OPENCL 0 @@ -613,7 +624,7 @@ +#define CONFIG_FAST_UNALIGNED 1 +#define CONFIG_FFT 1 +#define CONFIG_LSP 0 -+#define CONFIG_MDCT 1 ++#define CONFIG_MDCT 0 +#define CONFIG_PIXELUTILS 0 +#define CONFIG_NETWORK 0 +#define CONFIG_RDFT 1 @@ -666,7 +677,6 @@ +#define CONFIG_FAANDCT 0 +#define CONFIG_FAANIDCT 0 +#define CONFIG_FDCTDSP 0 -+#define CONFIG_FLACDSP 1 +#define CONFIG_FMTCONVERT 0 +#define CONFIG_FRAME_THREAD_ENCODER 0 +#define CONFIG_G722DSP 0 @@ -685,7 +695,6 @@ +#define CONFIG_HUFFYUVENCDSP 0 +#define CONFIG_IDCTDSP 0 +#define CONFIG_IIRFILTER 0 -+#define CONFIG_MDCT15 1 +#define CONFIG_INFLATE_WRAPPER 0 +#define CONFIG_INTRAX8 0 +#define CONFIG_ISO_MEDIA 1 @@ -707,6 +716,8 @@ +#define CONFIG_MPEGVIDEO 0 +#define CONFIG_MPEGVIDEODEC 0 +#define CONFIG_MPEGVIDEOENC 0 ++#define CONFIG_MSMPEG4DEC 0 ++#define CONFIG_MSMPEG4ENC 0 +#define CONFIG_MSS34DSP 0 +#define CONFIG_PIXBLOCKDSP 0 +#define CONFIG_QPELDSP 0 diff --git a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h index 7405cd8dc8d4..ca2f2e453384 100644 --- a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h +++ b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config_components.h.orig 2022-10-05 07:34:01 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config_components.h.orig 2023-03-13 07:33:08 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config_components.h -@@ -0,0 +1,2063 @@ +@@ -0,0 +1,2125 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_COMPONENTS_H +#define FFMPEG_CONFIG_COMPONENTS_H @@ -11,6 +11,7 @@ +#define CONFIG_CHOMP_BSF 0 +#define CONFIG_DUMP_EXTRADATA_BSF 0 +#define CONFIG_DCA_CORE_BSF 0 ++#define CONFIG_DTS2PTS_BSF 0 +#define CONFIG_DV_ERROR_MARKER_BSF 0 +#define CONFIG_EAC3_CORE_BSF 0 +#define CONFIG_EXTRACT_EXTRADATA_BSF 0 @@ -32,6 +33,7 @@ +#define CONFIG_NULL_BSF 0 +#define CONFIG_OPUS_METADATA_BSF 0 +#define CONFIG_PCM_RECHUNK_BSF 0 ++#define CONFIG_PGS_FRAME_MERGE_BSF 0 +#define CONFIG_PRORES_METADATA_BSF 0 +#define CONFIG_REMOVE_EXTRADATA_BSF 0 +#define CONFIG_SETTS_BSF 0 @@ -164,6 +166,7 @@ +#define CONFIG_M101_DECODER 0 +#define CONFIG_MAGICYUV_DECODER 0 +#define CONFIG_MDEC_DECODER 0 ++#define CONFIG_MEDIA100_DECODER 0 +#define CONFIG_MIMIC_DECODER 0 +#define CONFIG_MJPEG_DECODER 0 +#define CONFIG_MJPEGB_DECODER 0 @@ -213,6 +216,7 @@ +#define CONFIG_PGM_DECODER 0 +#define CONFIG_PGMYUV_DECODER 0 +#define CONFIG_PGX_DECODER 0 ++#define CONFIG_PHM_DECODER 0 +#define CONFIG_PHOTOCD_DECODER 0 +#define CONFIG_PICTOR_DECODER 0 +#define CONFIG_PIXLET_DECODER 0 @@ -223,6 +227,7 @@ +#define CONFIG_PSD_DECODER 0 +#define CONFIG_PTX_DECODER 0 +#define CONFIG_QDRAW_DECODER 0 ++#define CONFIG_QOI_DECODER 0 +#define CONFIG_QPEG_DECODER 0 +#define CONFIG_QTRLE_DECODER 0 +#define CONFIG_R10K_DECODER 0 @@ -279,6 +284,7 @@ +#define CONFIG_V408_DECODER 0 +#define CONFIG_V410_DECODER 0 +#define CONFIG_VB_DECODER 0 ++#define CONFIG_VBN_DECODER 0 +#define CONFIG_VBLE_DECODER 0 +#define CONFIG_VC1_DECODER 0 +#define CONFIG_VC1_CRYSTALHD_DECODER 0 @@ -303,6 +309,8 @@ +#define CONFIG_VP9_RKMPP_DECODER 0 +#define CONFIG_VP9_V4L2M2M_DECODER 0 +#define CONFIG_VQA_DECODER 0 ++#define CONFIG_VQC_DECODER 0 ++#define CONFIG_WBMP_DECODER 0 +#define CONFIG_WEBP_DECODER 0 +#define CONFIG_WCMV_DECODER 0 +#define CONFIG_WRAPPED_AVFRAME_DECODER 0 @@ -337,6 +345,7 @@ +#define CONFIG_ALS_DECODER 0 +#define CONFIG_AMRNB_DECODER 0 +#define CONFIG_AMRWB_DECODER 0 ++#define CONFIG_APAC_DECODER 0 +#define CONFIG_APE_DECODER 0 +#define CONFIG_APTX_DECODER 0 +#define CONFIG_APTX_HD_DECODER 0 @@ -349,6 +358,7 @@ +#define CONFIG_BINKAUDIO_DCT_DECODER 0 +#define CONFIG_BINKAUDIO_RDFT_DECODER 0 +#define CONFIG_BMV_AUDIO_DECODER 0 ++#define CONFIG_BONK_DECODER 0 +#define CONFIG_COOK_DECODER 0 +#define CONFIG_DCA_DECODER 0 +#define CONFIG_DFPWM_DECODER 0 @@ -365,12 +375,14 @@ +#define CONFIG_FASTAUDIO_DECODER 0 +#define CONFIG_FFWAVESYNTH_DECODER 0 +#define CONFIG_FLAC_DECODER 1 ++#define CONFIG_FTR_DECODER 0 +#define CONFIG_G723_1_DECODER 0 +#define CONFIG_G729_DECODER 0 +#define CONFIG_GSM_DECODER 0 +#define CONFIG_GSM_MS_DECODER 0 +#define CONFIG_HCA_DECODER 0 +#define CONFIG_HCOM_DECODER 0 ++#define CONFIG_HDR_DECODER 0 +#define CONFIG_IAC_DECODER 0 +#define CONFIG_ILBC_DECODER 0 +#define CONFIG_IMC_DECODER 0 @@ -378,6 +390,7 @@ +#define CONFIG_MACE3_DECODER 0 +#define CONFIG_MACE6_DECODER 0 +#define CONFIG_METASOUND_DECODER 0 ++#define CONFIG_MISC4_DECODER 0 +#define CONFIG_MLP_DECODER 0 +#define CONFIG_MP1_DECODER 0 +#define CONFIG_MP1FLOAT_DECODER 0 @@ -563,6 +576,7 @@ +#define CONFIG_LIBGSM_DECODER 0 +#define CONFIG_LIBGSM_MS_DECODER 0 +#define CONFIG_LIBILBC_DECODER 0 ++#define CONFIG_LIBJXL_DECODER 0 +#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 +#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0 +#define CONFIG_LIBOPENJPEG_DECODER 0 @@ -628,6 +642,7 @@ +#define CONFIG_H261_ENCODER 0 +#define CONFIG_H263_ENCODER 0 +#define CONFIG_H263P_ENCODER 0 ++#define CONFIG_H264_MEDIACODEC_ENCODER 0 +#define CONFIG_HAP_ENCODER 0 +#define CONFIG_HUFFYUV_ENCODER 0 +#define CONFIG_JPEG2000_ENCODER 0 @@ -647,11 +662,13 @@ +#define CONFIG_PFM_ENCODER 0 +#define CONFIG_PGM_ENCODER 0 +#define CONFIG_PGMYUV_ENCODER 0 ++#define CONFIG_PHM_ENCODER 0 +#define CONFIG_PNG_ENCODER 0 +#define CONFIG_PPM_ENCODER 0 +#define CONFIG_PRORES_ENCODER 0 +#define CONFIG_PRORES_AW_ENCODER 0 +#define CONFIG_PRORES_KS_ENCODER 0 ++#define CONFIG_QOI_ENCODER 0 +#define CONFIG_QTRLE_ENCODER 0 +#define CONFIG_R10K_ENCODER 0 +#define CONFIG_R210_ENCODER 0 @@ -674,7 +691,9 @@ +#define CONFIG_V308_ENCODER 0 +#define CONFIG_V408_ENCODER 0 +#define CONFIG_V410_ENCODER 0 ++#define CONFIG_VBN_ENCODER 0 +#define CONFIG_VC2_ENCODER 0 ++#define CONFIG_WBMP_ENCODER 0 +#define CONFIG_WRAPPED_AVFRAME_ENCODER 0 +#define CONFIG_WMV1_ENCODER 0 +#define CONFIG_WMV2_ENCODER 0 @@ -696,6 +715,7 @@ +#define CONFIG_EAC3_ENCODER 0 +#define CONFIG_FLAC_ENCODER 0 +#define CONFIG_G723_1_ENCODER 0 ++#define CONFIG_HDR_ENCODER 0 +#define CONFIG_MLP_ENCODER 0 +#define CONFIG_MP2_ENCODER 0 +#define CONFIG_MP2FIXED_ENCODER 0 @@ -780,6 +800,7 @@ +#define CONFIG_LIBGSM_ENCODER 0 +#define CONFIG_LIBGSM_MS_ENCODER 0 +#define CONFIG_LIBILBC_ENCODER 0 ++#define CONFIG_LIBJXL_ENCODER 0 +#define CONFIG_LIBMP3LAME_ENCODER 0 +#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0 +#define CONFIG_LIBOPENJPEG_ENCODER 0 @@ -806,6 +827,8 @@ +#define CONFIG_AAC_MF_ENCODER 0 +#define CONFIG_AC3_MF_ENCODER 0 +#define CONFIG_H263_V4L2M2M_ENCODER 0 ++#define CONFIG_AV1_NVENC_ENCODER 0 ++#define CONFIG_AV1_QSV_ENCODER 0 +#define CONFIG_LIBOPENH264_ENCODER 0 +#define CONFIG_H264_AMF_ENCODER 0 +#define CONFIG_H264_MF_ENCODER 0 @@ -816,6 +839,7 @@ +#define CONFIG_H264_VAAPI_ENCODER 0 +#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0 +#define CONFIG_HEVC_AMF_ENCODER 0 ++#define CONFIG_HEVC_MEDIACODEC_ENCODER 0 +#define CONFIG_HEVC_MF_ENCODER 0 +#define CONFIG_HEVC_NVENC_ENCODER 0 +#define CONFIG_HEVC_QSV_ENCODER 0 @@ -840,6 +864,7 @@ +#define CONFIG_AV1_DXVA2_HWACCEL 0 +#define CONFIG_AV1_NVDEC_HWACCEL 0 +#define CONFIG_AV1_VAAPI_HWACCEL 0 ++#define CONFIG_AV1_VDPAU_HWACCEL 0 +#define CONFIG_H263_VAAPI_HWACCEL 0 +#define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0 +#define CONFIG_H264_D3D11VA_HWACCEL 0 @@ -916,6 +941,7 @@ +#define CONFIG_DVDSUB_PARSER 0 +#define CONFIG_DVD_NAV_PARSER 0 +#define CONFIG_FLAC_PARSER 1 ++#define CONFIG_FTR_PARSER 0 +#define CONFIG_G723_1_PARSER 0 +#define CONFIG_G729_PARSER 0 +#define CONFIG_GIF_PARSER 0 @@ -924,8 +950,10 @@ +#define CONFIG_H263_PARSER 0 +#define CONFIG_H264_PARSER 1 +#define CONFIG_HEVC_PARSER 0 ++#define CONFIG_HDR_PARSER 0 +#define CONFIG_IPU_PARSER 0 +#define CONFIG_JPEG2000_PARSER 0 ++#define CONFIG_MISC4_PARSER 0 +#define CONFIG_MJPEG_PARSER 0 +#define CONFIG_MLP_PARSER 0 +#define CONFIG_MPEG4VIDEO_PARSER 0 @@ -934,6 +962,7 @@ +#define CONFIG_OPUS_PARSER 1 +#define CONFIG_PNG_PARSER 0 +#define CONFIG_PNM_PARSER 0 ++#define CONFIG_QOI_PARSER 0 +#define CONFIG_RV30_PARSER 0 +#define CONFIG_RV40_PARSER 0 +#define CONFIG_SBC_PARSER 0 @@ -947,6 +976,7 @@ +#define CONFIG_WEBP_PARSER 0 +#define CONFIG_XBM_PARSER 0 +#define CONFIG_XMA_PARSER 0 ++#define CONFIG_XWD_PARSER 0 +#define CONFIG_ALSA_INDEV 0 +#define CONFIG_ANDROID_CAMERA_INDEV 0 +#define CONFIG_AVFOUNDATION_INDEV 0 @@ -1108,9 +1138,11 @@ +#define CONFIG_STEREOWIDEN_FILTER 0 +#define CONFIG_SUPEREQUALIZER_FILTER 0 +#define CONFIG_SURROUND_FILTER 0 ++#define CONFIG_TILTSHELF_FILTER 0 +#define CONFIG_TREBLE_FILTER 0 +#define CONFIG_TREMOLO_FILTER 0 +#define CONFIG_VIBRATO_FILTER 0 ++#define CONFIG_VIRTUALBASS_FILTER 0 +#define CONFIG_VOLUME_FILTER 0 +#define CONFIG_VOLUMEDETECT_FILTER 0 +#define CONFIG_AEVALSRC_FILTER 0 @@ -1131,14 +1163,18 @@ +#define CONFIG_AVGBLUR_FILTER 0 +#define CONFIG_AVGBLUR_OPENCL_FILTER 0 +#define CONFIG_AVGBLUR_VULKAN_FILTER 0 ++#define CONFIG_BACKGROUNDKEY_FILTER 0 +#define CONFIG_BBOX_FILTER 0 +#define CONFIG_BENCH_FILTER 0 +#define CONFIG_BILATERAL_FILTER 0 ++#define CONFIG_BILATERAL_CUDA_FILTER 0 +#define CONFIG_BITPLANENOISE_FILTER 0 +#define CONFIG_BLACKDETECT_FILTER 0 +#define CONFIG_BLACKFRAME_FILTER 0 +#define CONFIG_BLEND_FILTER 0 +#define CONFIG_BLEND_VULKAN_FILTER 0 ++#define CONFIG_BLOCKDETECT_FILTER 0 ++#define CONFIG_BLURDETECT_FILTER 0 +#define CONFIG_BM3D_FILTER 0 +#define CONFIG_BOXBLUR_FILTER 0 +#define CONFIG_BOXBLUR_OPENCL_FILTER 0 @@ -1147,6 +1183,7 @@ +#define CONFIG_CHROMABER_VULKAN_FILTER 0 +#define CONFIG_CHROMAHOLD_FILTER 0 +#define CONFIG_CHROMAKEY_FILTER 0 ++#define CONFIG_CHROMAKEY_CUDA_FILTER 0 +#define CONFIG_CHROMANR_FILTER 0 +#define CONFIG_CHROMASHIFT_FILTER 0 +#define CONFIG_CIESCOPE_FILTER 0 @@ -1160,8 +1197,10 @@ +#define CONFIG_COLORKEY_OPENCL_FILTER 0 +#define CONFIG_COLORHOLD_FILTER 0 +#define CONFIG_COLORLEVELS_FILTER 0 ++#define CONFIG_COLORMAP_FILTER 0 +#define CONFIG_COLORMATRIX_FILTER 0 +#define CONFIG_COLORSPACE_FILTER 0 ++#define CONFIG_COLORSPACE_CUDA_FILTER 0 +#define CONFIG_COLORTEMPERATURE_FILTER 0 +#define CONFIG_CONVOLUTION_FILTER 0 +#define CONFIG_CONVOLUTION_OPENCL_FILTER 0 @@ -1215,6 +1254,7 @@ +#define CONFIG_EXPOSURE_FILTER 0 +#define CONFIG_EXTRACTPLANES_FILTER 0 +#define CONFIG_FADE_FILTER 0 ++#define CONFIG_FEEDBACK_FILTER 0 +#define CONFIG_FFTDNOIZ_FILTER 0 +#define CONFIG_FFTFILT_FILTER 0 +#define CONFIG_FIELD_FILTER 0 @@ -1259,6 +1299,8 @@ +#define CONFIG_HWUPLOAD_FILTER 0 +#define CONFIG_HWUPLOAD_CUDA_FILTER 0 +#define CONFIG_HYSTERESIS_FILTER 0 ++#define CONFIG_ICCDETECT_FILTER 0 ++#define CONFIG_ICCGEN_FILTER 0 +#define CONFIG_IDENTITY_FILTER 0 +#define CONFIG_IDET_FILTER 0 +#define CONFIG_IL_FILTER 0 @@ -1301,6 +1343,7 @@ +#define CONFIG_MORPHO_FILTER 0 +#define CONFIG_MPDECIMATE_FILTER 0 +#define CONFIG_MSAD_FILTER 0 ++#define CONFIG_MULTIPLY_FILTER 0 +#define CONFIG_NEGATE_FILTER 0 +#define CONFIG_NLMEANS_FILTER 0 +#define CONFIG_NLMEANS_OPENCL_FILTER 0 @@ -1328,6 +1371,7 @@ +#define CONFIG_PHASE_FILTER 0 +#define CONFIG_PHOTOSENSITIVITY_FILTER 0 +#define CONFIG_PIXDESCTEST_FILTER 0 ++#define CONFIG_PIXELIZE_FILTER 0 +#define CONFIG_PIXSCOPE_FILTER 0 +#define CONFIG_PP_FILTER 0 +#define CONFIG_PP7_FILTER 0 @@ -1345,6 +1389,7 @@ +#define CONFIG_READVITC_FILTER 0 +#define CONFIG_REALTIME_FILTER 0 +#define CONFIG_REMAP_FILTER 0 ++#define CONFIG_REMAP_OPENCL_FILTER 0 +#define CONFIG_REMOVEGRAIN_FILTER 0 +#define CONFIG_REMOVELOGO_FILTER 0 +#define CONFIG_REPEATFIELDS_FILTER 0 @@ -1388,6 +1433,7 @@ +#define CONFIG_SIDEDATA_FILTER 0 +#define CONFIG_SIGNALSTATS_FILTER 0 +#define CONFIG_SIGNATURE_FILTER 0 ++#define CONFIG_SITI_FILTER 0 +#define CONFIG_SMARTBLUR_FILTER 0 +#define CONFIG_SOBEL_FILTER 0 +#define CONFIG_SOBEL_OPENCL_FILTER 0 @@ -1463,8 +1509,10 @@ +#define CONFIG_ALLYUV_FILTER 0 +#define CONFIG_CELLAUTO_FILTER 0 +#define CONFIG_COLOR_FILTER 0 ++#define CONFIG_COLORCHART_FILTER 0 +#define CONFIG_COLORSPECTRUM_FILTER 0 +#define CONFIG_COREIMAGESRC_FILTER 0 ++#define CONFIG_DDAGRAB_FILTER 0 +#define CONFIG_FREI0R_SRC_FILTER 0 +#define CONFIG_GRADIENTS_FILTER 0 +#define CONFIG_HALDCLUTSRC_FILTER 0 @@ -1483,6 +1531,7 @@ +#define CONFIG_TESTSRC2_FILTER 0 +#define CONFIG_YUVTESTSRC_FILTER 0 +#define CONFIG_NULLSINK_FILTER 0 ++#define CONFIG_A3DSCOPE_FILTER 0 +#define CONFIG_ABITSCOPE_FILTER 0 +#define CONFIG_ADRAWGRAPH_FILTER 0 +#define CONFIG_AGRAPHMONITOR_FILTER 0 @@ -1499,6 +1548,7 @@ +#define CONFIG_SHOWWAVES_FILTER 0 +#define CONFIG_SHOWWAVESPIC_FILTER 0 +#define CONFIG_SPECTRUMSYNTH_FILTER 0 ++#define CONFIG_AVSYNCTEST_FILTER 0 +#define CONFIG_AMOVIE_FILTER 0 +#define CONFIG_MOVIE_FILTER 0 +#define CONFIG_AFIFO_FILTER 0 @@ -1523,6 +1573,7 @@ +#define CONFIG_AMRNB_DEMUXER 0 +#define CONFIG_AMRWB_DEMUXER 0 +#define CONFIG_ANM_DEMUXER 0 ++#define CONFIG_APAC_DEMUXER 0 +#define CONFIG_APC_DEMUXER 0 +#define CONFIG_APE_DEMUXER 0 +#define CONFIG_APM_DEMUXER 0 @@ -1556,6 +1607,7 @@ +#define CONFIG_BFSTM_DEMUXER 0 +#define CONFIG_BRSTM_DEMUXER 0 +#define CONFIG_BOA_DEMUXER 0 ++#define CONFIG_BONK_DEMUXER 0 +#define CONFIG_C93_DEMUXER 0 +#define CONFIG_CAF_DEMUXER 0 +#define CONFIG_CAVSVIDEO_DEMUXER 0 @@ -1640,6 +1692,7 @@ +#define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 +#define CONFIG_KVAG_DEMUXER 0 ++#define CONFIG_LAF_DEMUXER 0 +#define CONFIG_LMLM4_DEMUXER 0 +#define CONFIG_LOAS_DEMUXER 0 +#define CONFIG_LUODAT_DEMUXER 0 @@ -1812,25 +1865,31 @@ +#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_HDR_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PFM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PGX_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PHM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PSD_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_QOI_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_SVG_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_VBN_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_XBM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_XPM_PIPE_DEMUXER 0 @@ -1859,6 +1918,7 @@ +#define CONFIG_ASF_STREAM_MUXER 0 +#define CONFIG_AU_MUXER 0 +#define CONFIG_AVI_MUXER 0 ++#define CONFIG_AVIF_MUXER 0 +#define CONFIG_AVM2_MUXER 0 +#define CONFIG_AVS2_MUXER 0 +#define CONFIG_AVS3_MUXER 0 @@ -2063,4 +2123,6 @@ +#define CONFIG_LIBSSH_PROTOCOL 0 +#define CONFIG_LIBSMBCLIENT_PROTOCOL 0 +#define CONFIG_LIBZMQ_PROTOCOL 0 ++#define CONFIG_IPFS_PROTOCOL 0 ++#define CONFIG_IPNS_PROTOCOL 0 +#endif /* FFMPEG_CONFIG_COMPONENTS_H */ diff --git a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm index b2d95967e8b2..60d8361bec16 100644 --- a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm +++ b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm.orig 2022-10-05 07:34:01 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm.orig 2023-03-13 07:33:08 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm -@@ -0,0 +1,720 @@ +@@ -0,0 +1,731 @@ +; Automatically generated by configure - do not modify! +%define ARCH_AARCH64 0 +%define ARCH_ALPHA 0 @@ -44,6 +44,7 @@ +%define HAVE_POWER8 0 +%define HAVE_PPC4XX 0 +%define HAVE_VSX 0 ++%define HAVE_RVV 0 +%define HAVE_AESNI 1 +%define HAVE_AMD3DNOW 1 +%define HAVE_AMD3DNOWEXT 1 @@ -92,6 +93,7 @@ +%define HAVE_POWER8_EXTERNAL 0 +%define HAVE_PPC4XX_EXTERNAL 0 +%define HAVE_VSX_EXTERNAL 0 ++%define HAVE_RVV_EXTERNAL 0 +%define HAVE_AESNI_EXTERNAL 1 +%define HAVE_AMD3DNOW_EXTERNAL 1 +%define HAVE_AMD3DNOWEXT_EXTERNAL 1 @@ -140,6 +142,7 @@ +%define HAVE_POWER8_INLINE 0 +%define HAVE_PPC4XX_INLINE 0 +%define HAVE_VSX_INLINE 0 ++%define HAVE_RVV_INLINE 0 +%define HAVE_AESNI_INLINE 1 +%define HAVE_AMD3DNOW_INLINE 1 +%define HAVE_AMD3DNOWEXT_INLINE 1 @@ -178,6 +181,7 @@ +%define HAVE_FAST_64BIT 0 +%define HAVE_FAST_CLZ 1 +%define HAVE_FAST_CMOV 0 ++%define HAVE_FAST_FLOAT16 0 +%define HAVE_LOCAL_ALIGNED 1 +%define HAVE_SIMD_ALIGN_16 1 +%define HAVE_SIMD_ALIGN_32 1 @@ -281,6 +285,7 @@ +%define HAVE_FCNTL 1 +%define HAVE_GETADDRINFO 0 +%define HAVE_GETAUXVAL 0 ++%define HAVE_GETENV 1 +%define HAVE_GETHRTIME 0 +%define HAVE_GETOPT 1 +%define HAVE_GETMODULEHANDLE 0 @@ -309,6 +314,7 @@ +%define HAVE_NANOSLEEP 1 +%define HAVE_PEEKNAMEDPIPE 0 +%define HAVE_POSIX_MEMALIGN 1 ++%define HAVE_PRCTL 0 +%define HAVE_PTHREAD_CANCEL 1 +%define HAVE_SCHED_GETAFFINITY 0 +%define HAVE_SECITEMIMPORT 0 @@ -348,12 +354,14 @@ +%define HAVE_INLINE_ASM_LABELS 1 +%define HAVE_INLINE_ASM_NONLOCAL_LABELS 1 +%define HAVE_PRAGMA_DEPRECATED 1 -+%define HAVE_RSYNC_CONTIMEOUT 1 ++%define HAVE_RSYNC_CONTIMEOUT 0 +%define HAVE_SYMVER_ASM_LABEL 1 +%define HAVE_SYMVER_GNU_ASM 1 +%define HAVE_VFP_ARGS 0 +%define HAVE_XFORM_ASM 0 +%define HAVE_XMM_CLOBBERS 1 ++%define HAVE_DPI_AWARENESS_CONTEXT 0 ++%define HAVE_IDXGIOUTPUT5 0 +%define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +%define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0 +%define HAVE_KCMVIDEOCODECTYPE_VP9 0 @@ -456,6 +464,7 @@ +%define CONFIG_GNUTLS 0 +%define CONFIG_JNI 0 +%define CONFIG_LADSPA 0 ++%define CONFIG_LCMS2 0 +%define CONFIG_LIBAOM 0 +%define CONFIG_LIBASS 0 +%define CONFIG_LIBBLURAY 0 @@ -476,6 +485,7 @@ +%define CONFIG_LIBIEC61883 0 +%define CONFIG_LIBILBC 0 +%define CONFIG_LIBJACK 0 ++%define CONFIG_LIBJXL 0 +%define CONFIG_LIBKLVANC 0 +%define CONFIG_LIBKVAZAAR 0 +%define CONFIG_LIBMODPLUG 0 @@ -547,6 +557,7 @@ +%define CONFIG_CUDA_SDK 0 +%define CONFIG_LIBNPP 0 +%define CONFIG_LIBMFX 0 ++%define CONFIG_LIBVPL 0 +%define CONFIG_MMAL 0 +%define CONFIG_OMX 0 +%define CONFIG_OPENCL 0 @@ -597,7 +608,7 @@ +%define CONFIG_FAST_UNALIGNED 1 +%define CONFIG_FFT 1 +%define CONFIG_LSP 0 -+%define CONFIG_MDCT 1 ++%define CONFIG_MDCT 0 +%define CONFIG_PIXELUTILS 0 +%define CONFIG_NETWORK 0 +%define CONFIG_RDFT 1 @@ -650,7 +661,6 @@ +%define CONFIG_FAANDCT 0 +%define CONFIG_FAANIDCT 0 +%define CONFIG_FDCTDSP 0 -+%define CONFIG_FLACDSP 1 +%define CONFIG_FMTCONVERT 0 +%define CONFIG_FRAME_THREAD_ENCODER 0 +%define CONFIG_G722DSP 0 @@ -669,7 +679,6 @@ +%define CONFIG_HUFFYUVENCDSP 0 +%define CONFIG_IDCTDSP 0 +%define CONFIG_IIRFILTER 0 -+%define CONFIG_MDCT15 1 +%define CONFIG_INFLATE_WRAPPER 0 +%define CONFIG_INTRAX8 0 +%define CONFIG_ISO_MEDIA 1 @@ -691,6 +700,8 @@ +%define CONFIG_MPEGVIDEO 0 +%define CONFIG_MPEGVIDEODEC 0 +%define CONFIG_MPEGVIDEOENC 0 ++%define CONFIG_MSMPEG4DEC 0 ++%define CONFIG_MSMPEG4ENC 0 +%define CONFIG_MSS34DSP 0 +%define CONFIG_PIXBLOCKDSP 0 +%define CONFIG_QPELDSP 0 diff --git a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h index dbda65372b22..7624ec247ab8 100644 --- a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h +++ b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h @@ -1,10 +1,10 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h.orig 2022-10-05 07:34:01 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h.orig 2023-03-13 07:33:08 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h -@@ -0,0 +1,737 @@ +@@ -0,0 +1,748 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_H +#define FFMPEG_CONFIG_H -+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/d/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ ++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +#define FFMPEG_LICENSE "LGPL version 2.1 or later" +#define CONFIG_THIS_YEAR 2022 +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -60,6 +60,7 @@ +#define HAVE_POWER8 0 +#define HAVE_PPC4XX 0 +#define HAVE_VSX 0 ++#define HAVE_RVV 0 +#define HAVE_AESNI 1 +#define HAVE_AMD3DNOW 1 +#define HAVE_AMD3DNOWEXT 1 @@ -108,6 +109,7 @@ +#define HAVE_POWER8_EXTERNAL 0 +#define HAVE_PPC4XX_EXTERNAL 0 +#define HAVE_VSX_EXTERNAL 0 ++#define HAVE_RVV_EXTERNAL 0 +#define HAVE_AESNI_EXTERNAL 1 +#define HAVE_AMD3DNOW_EXTERNAL 1 +#define HAVE_AMD3DNOWEXT_EXTERNAL 1 @@ -156,6 +158,7 @@ +#define HAVE_POWER8_INLINE 0 +#define HAVE_PPC4XX_INLINE 0 +#define HAVE_VSX_INLINE 0 ++#define HAVE_RVV_INLINE 0 +#define HAVE_AESNI_INLINE 1 +#define HAVE_AMD3DNOW_INLINE 1 +#define HAVE_AMD3DNOWEXT_INLINE 1 @@ -194,6 +197,7 @@ +#define HAVE_FAST_64BIT 0 +#define HAVE_FAST_CLZ 1 +#define HAVE_FAST_CMOV 0 ++#define HAVE_FAST_FLOAT16 0 +#define HAVE_LOCAL_ALIGNED 1 +#define HAVE_SIMD_ALIGN_16 1 +#define HAVE_SIMD_ALIGN_32 1 @@ -297,6 +301,7 @@ +#define HAVE_FCNTL 1 +#define HAVE_GETADDRINFO 0 +#define HAVE_GETAUXVAL 0 ++#define HAVE_GETENV 1 +#define HAVE_GETHRTIME 0 +#define HAVE_GETOPT 1 +#define HAVE_GETMODULEHANDLE 0 @@ -325,6 +330,7 @@ +#define HAVE_NANOSLEEP 1 +#define HAVE_PEEKNAMEDPIPE 0 +#define HAVE_POSIX_MEMALIGN 1 ++#define HAVE_PRCTL 0 /* #define HAVE_PRCTL 1 -- forced to 0 for Fuchsia */ +#define HAVE_PTHREAD_CANCEL 1 +#define HAVE_SCHED_GETAFFINITY 0 +#define HAVE_SECITEMIMPORT 0 @@ -364,12 +370,14 @@ +#define HAVE_INLINE_ASM_LABELS 1 +#define HAVE_INLINE_ASM_NONLOCAL_LABELS 1 +#define HAVE_PRAGMA_DEPRECATED 1 -+#define HAVE_RSYNC_CONTIMEOUT 1 ++#define HAVE_RSYNC_CONTIMEOUT 0 +#define HAVE_SYMVER_ASM_LABEL 1 +#define HAVE_SYMVER_GNU_ASM 1 +#define HAVE_VFP_ARGS 0 +#define HAVE_XFORM_ASM 0 +#define HAVE_XMM_CLOBBERS 1 ++#define HAVE_DPI_AWARENESS_CONTEXT 0 ++#define HAVE_IDXGIOUTPUT5 0 +#define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0 +#define HAVE_KCMVIDEOCODECTYPE_VP9 0 @@ -472,6 +480,7 @@ +#define CONFIG_GNUTLS 0 +#define CONFIG_JNI 0 +#define CONFIG_LADSPA 0 ++#define CONFIG_LCMS2 0 +#define CONFIG_LIBAOM 0 +#define CONFIG_LIBASS 0 +#define CONFIG_LIBBLURAY 0 @@ -492,6 +501,7 @@ +#define CONFIG_LIBIEC61883 0 +#define CONFIG_LIBILBC 0 +#define CONFIG_LIBJACK 0 ++#define CONFIG_LIBJXL 0 +#define CONFIG_LIBKLVANC 0 +#define CONFIG_LIBKVAZAAR 0 +#define CONFIG_LIBMODPLUG 0 @@ -563,6 +573,7 @@ +#define CONFIG_CUDA_SDK 0 +#define CONFIG_LIBNPP 0 +#define CONFIG_LIBMFX 0 ++#define CONFIG_LIBVPL 0 +#define CONFIG_MMAL 0 +#define CONFIG_OMX 0 +#define CONFIG_OPENCL 0 @@ -613,7 +624,7 @@ +#define CONFIG_FAST_UNALIGNED 1 +#define CONFIG_FFT 1 +#define CONFIG_LSP 0 -+#define CONFIG_MDCT 1 ++#define CONFIG_MDCT 0 +#define CONFIG_PIXELUTILS 0 +#define CONFIG_NETWORK 0 +#define CONFIG_RDFT 1 @@ -666,7 +677,6 @@ +#define CONFIG_FAANDCT 0 +#define CONFIG_FAANIDCT 0 +#define CONFIG_FDCTDSP 0 -+#define CONFIG_FLACDSP 1 +#define CONFIG_FMTCONVERT 0 +#define CONFIG_FRAME_THREAD_ENCODER 0 +#define CONFIG_G722DSP 0 @@ -685,7 +695,6 @@ +#define CONFIG_HUFFYUVENCDSP 0 +#define CONFIG_IDCTDSP 0 +#define CONFIG_IIRFILTER 0 -+#define CONFIG_MDCT15 1 +#define CONFIG_INFLATE_WRAPPER 0 +#define CONFIG_INTRAX8 0 +#define CONFIG_ISO_MEDIA 1 @@ -707,6 +716,8 @@ +#define CONFIG_MPEGVIDEO 0 +#define CONFIG_MPEGVIDEODEC 0 +#define CONFIG_MPEGVIDEOENC 0 ++#define CONFIG_MSMPEG4DEC 0 ++#define CONFIG_MSMPEG4ENC 0 +#define CONFIG_MSS34DSP 0 +#define CONFIG_PIXBLOCKDSP 0 +#define CONFIG_QPELDSP 0 diff --git a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config__components.h b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config__components.h index 0fa75e6fdda2..b998f2cc3d76 100644 --- a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config__components.h +++ b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config__components.h @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config_components.h.orig 2022-10-05 07:34:01 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config_components.h.orig 2023-03-13 07:33:08 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config_components.h -@@ -0,0 +1,2063 @@ +@@ -0,0 +1,2125 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_COMPONENTS_H +#define FFMPEG_CONFIG_COMPONENTS_H @@ -11,6 +11,7 @@ +#define CONFIG_CHOMP_BSF 0 +#define CONFIG_DUMP_EXTRADATA_BSF 0 +#define CONFIG_DCA_CORE_BSF 0 ++#define CONFIG_DTS2PTS_BSF 0 +#define CONFIG_DV_ERROR_MARKER_BSF 0 +#define CONFIG_EAC3_CORE_BSF 0 +#define CONFIG_EXTRACT_EXTRADATA_BSF 0 @@ -32,6 +33,7 @@ +#define CONFIG_NULL_BSF 0 +#define CONFIG_OPUS_METADATA_BSF 0 +#define CONFIG_PCM_RECHUNK_BSF 0 ++#define CONFIG_PGS_FRAME_MERGE_BSF 0 +#define CONFIG_PRORES_METADATA_BSF 0 +#define CONFIG_REMOVE_EXTRADATA_BSF 0 +#define CONFIG_SETTS_BSF 0 @@ -164,6 +166,7 @@ +#define CONFIG_M101_DECODER 0 +#define CONFIG_MAGICYUV_DECODER 0 +#define CONFIG_MDEC_DECODER 0 ++#define CONFIG_MEDIA100_DECODER 0 +#define CONFIG_MIMIC_DECODER 0 +#define CONFIG_MJPEG_DECODER 0 +#define CONFIG_MJPEGB_DECODER 0 @@ -213,6 +216,7 @@ +#define CONFIG_PGM_DECODER 0 +#define CONFIG_PGMYUV_DECODER 0 +#define CONFIG_PGX_DECODER 0 ++#define CONFIG_PHM_DECODER 0 +#define CONFIG_PHOTOCD_DECODER 0 +#define CONFIG_PICTOR_DECODER 0 +#define CONFIG_PIXLET_DECODER 0 @@ -223,6 +227,7 @@ +#define CONFIG_PSD_DECODER 0 +#define CONFIG_PTX_DECODER 0 +#define CONFIG_QDRAW_DECODER 0 ++#define CONFIG_QOI_DECODER 0 +#define CONFIG_QPEG_DECODER 0 +#define CONFIG_QTRLE_DECODER 0 +#define CONFIG_R10K_DECODER 0 @@ -279,6 +284,7 @@ +#define CONFIG_V408_DECODER 0 +#define CONFIG_V410_DECODER 0 +#define CONFIG_VB_DECODER 0 ++#define CONFIG_VBN_DECODER 0 +#define CONFIG_VBLE_DECODER 0 +#define CONFIG_VC1_DECODER 0 +#define CONFIG_VC1_CRYSTALHD_DECODER 0 @@ -303,6 +309,8 @@ +#define CONFIG_VP9_RKMPP_DECODER 0 +#define CONFIG_VP9_V4L2M2M_DECODER 0 +#define CONFIG_VQA_DECODER 0 ++#define CONFIG_VQC_DECODER 0 ++#define CONFIG_WBMP_DECODER 0 +#define CONFIG_WEBP_DECODER 0 +#define CONFIG_WCMV_DECODER 0 +#define CONFIG_WRAPPED_AVFRAME_DECODER 0 @@ -337,6 +345,7 @@ +#define CONFIG_ALS_DECODER 0 +#define CONFIG_AMRNB_DECODER 0 +#define CONFIG_AMRWB_DECODER 0 ++#define CONFIG_APAC_DECODER 0 +#define CONFIG_APE_DECODER 0 +#define CONFIG_APTX_DECODER 0 +#define CONFIG_APTX_HD_DECODER 0 @@ -349,6 +358,7 @@ +#define CONFIG_BINKAUDIO_DCT_DECODER 0 +#define CONFIG_BINKAUDIO_RDFT_DECODER 0 +#define CONFIG_BMV_AUDIO_DECODER 0 ++#define CONFIG_BONK_DECODER 0 +#define CONFIG_COOK_DECODER 0 +#define CONFIG_DCA_DECODER 0 +#define CONFIG_DFPWM_DECODER 0 @@ -365,12 +375,14 @@ +#define CONFIG_FASTAUDIO_DECODER 0 +#define CONFIG_FFWAVESYNTH_DECODER 0 +#define CONFIG_FLAC_DECODER 1 ++#define CONFIG_FTR_DECODER 0 +#define CONFIG_G723_1_DECODER 0 +#define CONFIG_G729_DECODER 0 +#define CONFIG_GSM_DECODER 0 +#define CONFIG_GSM_MS_DECODER 0 +#define CONFIG_HCA_DECODER 0 +#define CONFIG_HCOM_DECODER 0 ++#define CONFIG_HDR_DECODER 0 +#define CONFIG_IAC_DECODER 0 +#define CONFIG_ILBC_DECODER 0 +#define CONFIG_IMC_DECODER 0 @@ -378,6 +390,7 @@ +#define CONFIG_MACE3_DECODER 0 +#define CONFIG_MACE6_DECODER 0 +#define CONFIG_METASOUND_DECODER 0 ++#define CONFIG_MISC4_DECODER 0 +#define CONFIG_MLP_DECODER 0 +#define CONFIG_MP1_DECODER 0 +#define CONFIG_MP1FLOAT_DECODER 0 @@ -563,6 +576,7 @@ +#define CONFIG_LIBGSM_DECODER 0 +#define CONFIG_LIBGSM_MS_DECODER 0 +#define CONFIG_LIBILBC_DECODER 0 ++#define CONFIG_LIBJXL_DECODER 0 +#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 +#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0 +#define CONFIG_LIBOPENJPEG_DECODER 0 @@ -628,6 +642,7 @@ +#define CONFIG_H261_ENCODER 0 +#define CONFIG_H263_ENCODER 0 +#define CONFIG_H263P_ENCODER 0 ++#define CONFIG_H264_MEDIACODEC_ENCODER 0 +#define CONFIG_HAP_ENCODER 0 +#define CONFIG_HUFFYUV_ENCODER 0 +#define CONFIG_JPEG2000_ENCODER 0 @@ -647,11 +662,13 @@ +#define CONFIG_PFM_ENCODER 0 +#define CONFIG_PGM_ENCODER 0 +#define CONFIG_PGMYUV_ENCODER 0 ++#define CONFIG_PHM_ENCODER 0 +#define CONFIG_PNG_ENCODER 0 +#define CONFIG_PPM_ENCODER 0 +#define CONFIG_PRORES_ENCODER 0 +#define CONFIG_PRORES_AW_ENCODER 0 +#define CONFIG_PRORES_KS_ENCODER 0 ++#define CONFIG_QOI_ENCODER 0 +#define CONFIG_QTRLE_ENCODER 0 +#define CONFIG_R10K_ENCODER 0 +#define CONFIG_R210_ENCODER 0 @@ -674,7 +691,9 @@ +#define CONFIG_V308_ENCODER 0 +#define CONFIG_V408_ENCODER 0 +#define CONFIG_V410_ENCODER 0 ++#define CONFIG_VBN_ENCODER 0 +#define CONFIG_VC2_ENCODER 0 ++#define CONFIG_WBMP_ENCODER 0 +#define CONFIG_WRAPPED_AVFRAME_ENCODER 0 +#define CONFIG_WMV1_ENCODER 0 +#define CONFIG_WMV2_ENCODER 0 @@ -696,6 +715,7 @@ +#define CONFIG_EAC3_ENCODER 0 +#define CONFIG_FLAC_ENCODER 0 +#define CONFIG_G723_1_ENCODER 0 ++#define CONFIG_HDR_ENCODER 0 +#define CONFIG_MLP_ENCODER 0 +#define CONFIG_MP2_ENCODER 0 +#define CONFIG_MP2FIXED_ENCODER 0 @@ -780,6 +800,7 @@ +#define CONFIG_LIBGSM_ENCODER 0 +#define CONFIG_LIBGSM_MS_ENCODER 0 +#define CONFIG_LIBILBC_ENCODER 0 ++#define CONFIG_LIBJXL_ENCODER 0 +#define CONFIG_LIBMP3LAME_ENCODER 0 +#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0 +#define CONFIG_LIBOPENJPEG_ENCODER 0 @@ -806,6 +827,8 @@ +#define CONFIG_AAC_MF_ENCODER 0 +#define CONFIG_AC3_MF_ENCODER 0 +#define CONFIG_H263_V4L2M2M_ENCODER 0 ++#define CONFIG_AV1_NVENC_ENCODER 0 ++#define CONFIG_AV1_QSV_ENCODER 0 +#define CONFIG_LIBOPENH264_ENCODER 0 +#define CONFIG_H264_AMF_ENCODER 0 +#define CONFIG_H264_MF_ENCODER 0 @@ -816,6 +839,7 @@ +#define CONFIG_H264_VAAPI_ENCODER 0 +#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0 +#define CONFIG_HEVC_AMF_ENCODER 0 ++#define CONFIG_HEVC_MEDIACODEC_ENCODER 0 +#define CONFIG_HEVC_MF_ENCODER 0 +#define CONFIG_HEVC_NVENC_ENCODER 0 +#define CONFIG_HEVC_QSV_ENCODER 0 @@ -840,6 +864,7 @@ +#define CONFIG_AV1_DXVA2_HWACCEL 0 +#define CONFIG_AV1_NVDEC_HWACCEL 0 +#define CONFIG_AV1_VAAPI_HWACCEL 0 ++#define CONFIG_AV1_VDPAU_HWACCEL 0 +#define CONFIG_H263_VAAPI_HWACCEL 0 +#define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0 +#define CONFIG_H264_D3D11VA_HWACCEL 0 @@ -916,6 +941,7 @@ +#define CONFIG_DVDSUB_PARSER 0 +#define CONFIG_DVD_NAV_PARSER 0 +#define CONFIG_FLAC_PARSER 1 ++#define CONFIG_FTR_PARSER 0 +#define CONFIG_G723_1_PARSER 0 +#define CONFIG_G729_PARSER 0 +#define CONFIG_GIF_PARSER 0 @@ -924,8 +950,10 @@ +#define CONFIG_H263_PARSER 0 +#define CONFIG_H264_PARSER 1 +#define CONFIG_HEVC_PARSER 0 ++#define CONFIG_HDR_PARSER 0 +#define CONFIG_IPU_PARSER 0 +#define CONFIG_JPEG2000_PARSER 0 ++#define CONFIG_MISC4_PARSER 0 +#define CONFIG_MJPEG_PARSER 0 +#define CONFIG_MLP_PARSER 0 +#define CONFIG_MPEG4VIDEO_PARSER 0 @@ -934,6 +962,7 @@ +#define CONFIG_OPUS_PARSER 1 +#define CONFIG_PNG_PARSER 0 +#define CONFIG_PNM_PARSER 0 ++#define CONFIG_QOI_PARSER 0 +#define CONFIG_RV30_PARSER 0 +#define CONFIG_RV40_PARSER 0 +#define CONFIG_SBC_PARSER 0 @@ -947,6 +976,7 @@ +#define CONFIG_WEBP_PARSER 0 +#define CONFIG_XBM_PARSER 0 +#define CONFIG_XMA_PARSER 0 ++#define CONFIG_XWD_PARSER 0 +#define CONFIG_ALSA_INDEV 0 +#define CONFIG_ANDROID_CAMERA_INDEV 0 +#define CONFIG_AVFOUNDATION_INDEV 0 @@ -1108,9 +1138,11 @@ +#define CONFIG_STEREOWIDEN_FILTER 0 +#define CONFIG_SUPEREQUALIZER_FILTER 0 +#define CONFIG_SURROUND_FILTER 0 ++#define CONFIG_TILTSHELF_FILTER 0 +#define CONFIG_TREBLE_FILTER 0 +#define CONFIG_TREMOLO_FILTER 0 +#define CONFIG_VIBRATO_FILTER 0 ++#define CONFIG_VIRTUALBASS_FILTER 0 +#define CONFIG_VOLUME_FILTER 0 +#define CONFIG_VOLUMEDETECT_FILTER 0 +#define CONFIG_AEVALSRC_FILTER 0 @@ -1131,14 +1163,18 @@ +#define CONFIG_AVGBLUR_FILTER 0 +#define CONFIG_AVGBLUR_OPENCL_FILTER 0 +#define CONFIG_AVGBLUR_VULKAN_FILTER 0 ++#define CONFIG_BACKGROUNDKEY_FILTER 0 +#define CONFIG_BBOX_FILTER 0 +#define CONFIG_BENCH_FILTER 0 +#define CONFIG_BILATERAL_FILTER 0 ++#define CONFIG_BILATERAL_CUDA_FILTER 0 +#define CONFIG_BITPLANENOISE_FILTER 0 +#define CONFIG_BLACKDETECT_FILTER 0 +#define CONFIG_BLACKFRAME_FILTER 0 +#define CONFIG_BLEND_FILTER 0 +#define CONFIG_BLEND_VULKAN_FILTER 0 ++#define CONFIG_BLOCKDETECT_FILTER 0 ++#define CONFIG_BLURDETECT_FILTER 0 +#define CONFIG_BM3D_FILTER 0 +#define CONFIG_BOXBLUR_FILTER 0 +#define CONFIG_BOXBLUR_OPENCL_FILTER 0 @@ -1147,6 +1183,7 @@ +#define CONFIG_CHROMABER_VULKAN_FILTER 0 +#define CONFIG_CHROMAHOLD_FILTER 0 +#define CONFIG_CHROMAKEY_FILTER 0 ++#define CONFIG_CHROMAKEY_CUDA_FILTER 0 +#define CONFIG_CHROMANR_FILTER 0 +#define CONFIG_CHROMASHIFT_FILTER 0 +#define CONFIG_CIESCOPE_FILTER 0 @@ -1160,8 +1197,10 @@ +#define CONFIG_COLORKEY_OPENCL_FILTER 0 +#define CONFIG_COLORHOLD_FILTER 0 +#define CONFIG_COLORLEVELS_FILTER 0 ++#define CONFIG_COLORMAP_FILTER 0 +#define CONFIG_COLORMATRIX_FILTER 0 +#define CONFIG_COLORSPACE_FILTER 0 ++#define CONFIG_COLORSPACE_CUDA_FILTER 0 +#define CONFIG_COLORTEMPERATURE_FILTER 0 +#define CONFIG_CONVOLUTION_FILTER 0 +#define CONFIG_CONVOLUTION_OPENCL_FILTER 0 @@ -1215,6 +1254,7 @@ +#define CONFIG_EXPOSURE_FILTER 0 +#define CONFIG_EXTRACTPLANES_FILTER 0 +#define CONFIG_FADE_FILTER 0 ++#define CONFIG_FEEDBACK_FILTER 0 +#define CONFIG_FFTDNOIZ_FILTER 0 +#define CONFIG_FFTFILT_FILTER 0 +#define CONFIG_FIELD_FILTER 0 @@ -1259,6 +1299,8 @@ +#define CONFIG_HWUPLOAD_FILTER 0 +#define CONFIG_HWUPLOAD_CUDA_FILTER 0 +#define CONFIG_HYSTERESIS_FILTER 0 ++#define CONFIG_ICCDETECT_FILTER 0 ++#define CONFIG_ICCGEN_FILTER 0 +#define CONFIG_IDENTITY_FILTER 0 +#define CONFIG_IDET_FILTER 0 +#define CONFIG_IL_FILTER 0 @@ -1301,6 +1343,7 @@ +#define CONFIG_MORPHO_FILTER 0 +#define CONFIG_MPDECIMATE_FILTER 0 +#define CONFIG_MSAD_FILTER 0 ++#define CONFIG_MULTIPLY_FILTER 0 +#define CONFIG_NEGATE_FILTER 0 +#define CONFIG_NLMEANS_FILTER 0 +#define CONFIG_NLMEANS_OPENCL_FILTER 0 @@ -1328,6 +1371,7 @@ +#define CONFIG_PHASE_FILTER 0 +#define CONFIG_PHOTOSENSITIVITY_FILTER 0 +#define CONFIG_PIXDESCTEST_FILTER 0 ++#define CONFIG_PIXELIZE_FILTER 0 +#define CONFIG_PIXSCOPE_FILTER 0 +#define CONFIG_PP_FILTER 0 +#define CONFIG_PP7_FILTER 0 @@ -1345,6 +1389,7 @@ +#define CONFIG_READVITC_FILTER 0 +#define CONFIG_REALTIME_FILTER 0 +#define CONFIG_REMAP_FILTER 0 ++#define CONFIG_REMAP_OPENCL_FILTER 0 +#define CONFIG_REMOVEGRAIN_FILTER 0 +#define CONFIG_REMOVELOGO_FILTER 0 +#define CONFIG_REPEATFIELDS_FILTER 0 @@ -1388,6 +1433,7 @@ +#define CONFIG_SIDEDATA_FILTER 0 +#define CONFIG_SIGNALSTATS_FILTER 0 +#define CONFIG_SIGNATURE_FILTER 0 ++#define CONFIG_SITI_FILTER 0 +#define CONFIG_SMARTBLUR_FILTER 0 +#define CONFIG_SOBEL_FILTER 0 +#define CONFIG_SOBEL_OPENCL_FILTER 0 @@ -1463,8 +1509,10 @@ +#define CONFIG_ALLYUV_FILTER 0 +#define CONFIG_CELLAUTO_FILTER 0 +#define CONFIG_COLOR_FILTER 0 ++#define CONFIG_COLORCHART_FILTER 0 +#define CONFIG_COLORSPECTRUM_FILTER 0 +#define CONFIG_COREIMAGESRC_FILTER 0 ++#define CONFIG_DDAGRAB_FILTER 0 +#define CONFIG_FREI0R_SRC_FILTER 0 +#define CONFIG_GRADIENTS_FILTER 0 +#define CONFIG_HALDCLUTSRC_FILTER 0 @@ -1483,6 +1531,7 @@ +#define CONFIG_TESTSRC2_FILTER 0 +#define CONFIG_YUVTESTSRC_FILTER 0 +#define CONFIG_NULLSINK_FILTER 0 ++#define CONFIG_A3DSCOPE_FILTER 0 +#define CONFIG_ABITSCOPE_FILTER 0 +#define CONFIG_ADRAWGRAPH_FILTER 0 +#define CONFIG_AGRAPHMONITOR_FILTER 0 @@ -1499,6 +1548,7 @@ +#define CONFIG_SHOWWAVES_FILTER 0 +#define CONFIG_SHOWWAVESPIC_FILTER 0 +#define CONFIG_SPECTRUMSYNTH_FILTER 0 ++#define CONFIG_AVSYNCTEST_FILTER 0 +#define CONFIG_AMOVIE_FILTER 0 +#define CONFIG_MOVIE_FILTER 0 +#define CONFIG_AFIFO_FILTER 0 @@ -1523,6 +1573,7 @@ +#define CONFIG_AMRNB_DEMUXER 0 +#define CONFIG_AMRWB_DEMUXER 0 +#define CONFIG_ANM_DEMUXER 0 ++#define CONFIG_APAC_DEMUXER 0 +#define CONFIG_APC_DEMUXER 0 +#define CONFIG_APE_DEMUXER 0 +#define CONFIG_APM_DEMUXER 0 @@ -1556,6 +1607,7 @@ +#define CONFIG_BFSTM_DEMUXER 0 +#define CONFIG_BRSTM_DEMUXER 0 +#define CONFIG_BOA_DEMUXER 0 ++#define CONFIG_BONK_DEMUXER 0 +#define CONFIG_C93_DEMUXER 0 +#define CONFIG_CAF_DEMUXER 0 +#define CONFIG_CAVSVIDEO_DEMUXER 0 @@ -1640,6 +1692,7 @@ +#define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 +#define CONFIG_KVAG_DEMUXER 0 ++#define CONFIG_LAF_DEMUXER 0 +#define CONFIG_LMLM4_DEMUXER 0 +#define CONFIG_LOAS_DEMUXER 0 +#define CONFIG_LUODAT_DEMUXER 0 @@ -1812,25 +1865,31 @@ +#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_HDR_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PFM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PGX_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PHM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PSD_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_QOI_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_SVG_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_VBN_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_XBM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_XPM_PIPE_DEMUXER 0 @@ -1859,6 +1918,7 @@ +#define CONFIG_ASF_STREAM_MUXER 0 +#define CONFIG_AU_MUXER 0 +#define CONFIG_AVI_MUXER 0 ++#define CONFIG_AVIF_MUXER 0 +#define CONFIG_AVM2_MUXER 0 +#define CONFIG_AVS2_MUXER 0 +#define CONFIG_AVS3_MUXER 0 @@ -2063,4 +2123,6 @@ +#define CONFIG_LIBSSH_PROTOCOL 0 +#define CONFIG_LIBSMBCLIENT_PROTOCOL 0 +#define CONFIG_LIBZMQ_PROTOCOL 0 ++#define CONFIG_IPFS_PROTOCOL 0 ++#define CONFIG_IPNS_PROTOCOL 0 +#endif /* FFMPEG_CONFIG_COMPONENTS_H */ diff --git a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm index 09755a9cca57..631010e81262 100644 --- a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm +++ b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm.orig 2022-10-05 07:34:01 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm.orig 2023-03-13 07:33:08 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm -@@ -0,0 +1,722 @@ +@@ -0,0 +1,731 @@ +; Automatically generated by configure - do not modify! +%define ARCH_AARCH64 0 +%define ARCH_ALPHA 0 @@ -44,6 +44,7 @@ +%define HAVE_POWER8 0 +%define HAVE_PPC4XX 0 +%define HAVE_VSX 0 ++%define HAVE_RVV 0 +%define HAVE_AESNI 1 +%define HAVE_AMD3DNOW 1 +%define HAVE_AMD3DNOWEXT 1 @@ -92,6 +93,7 @@ +%define HAVE_POWER8_EXTERNAL 0 +%define HAVE_PPC4XX_EXTERNAL 0 +%define HAVE_VSX_EXTERNAL 0 ++%define HAVE_RVV_EXTERNAL 0 +%define HAVE_AESNI_EXTERNAL 1 +%define HAVE_AMD3DNOW_EXTERNAL 1 +%define HAVE_AMD3DNOWEXT_EXTERNAL 1 @@ -140,6 +142,7 @@ +%define HAVE_POWER8_INLINE 0 +%define HAVE_PPC4XX_INLINE 0 +%define HAVE_VSX_INLINE 0 ++%define HAVE_RVV_INLINE 0 +%define HAVE_AESNI_INLINE 1 +%define HAVE_AMD3DNOW_INLINE 1 +%define HAVE_AMD3DNOWEXT_INLINE 1 @@ -178,6 +181,7 @@ +%define HAVE_FAST_64BIT 1 +%define HAVE_FAST_CLZ 1 +%define HAVE_FAST_CMOV 1 ++%define HAVE_FAST_FLOAT16 0 +%define HAVE_LOCAL_ALIGNED 1 +%define HAVE_SIMD_ALIGN_16 1 +%define HAVE_SIMD_ALIGN_32 1 @@ -281,6 +285,7 @@ +%define HAVE_FCNTL 1 +%define HAVE_GETADDRINFO 0 +%define HAVE_GETAUXVAL 0 ++%define HAVE_GETENV 1 +%define HAVE_GETHRTIME 0 +%define HAVE_GETOPT 1 +%define HAVE_GETMODULEHANDLE 0 @@ -309,6 +314,7 @@ +%define HAVE_NANOSLEEP 1 +%define HAVE_PEEKNAMEDPIPE 0 +%define HAVE_POSIX_MEMALIGN 1 ++%define HAVE_PRCTL 0 +%define HAVE_PTHREAD_CANCEL 1 +%define HAVE_SCHED_GETAFFINITY 0 +%define HAVE_SECITEMIMPORT 0 @@ -354,6 +360,8 @@ +%define HAVE_VFP_ARGS 0 +%define HAVE_XFORM_ASM 0 +%define HAVE_XMM_CLOBBERS 1 ++%define HAVE_DPI_AWARENESS_CONTEXT 0 ++%define HAVE_IDXGIOUTPUT5 0 +%define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +%define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0 +%define HAVE_KCMVIDEOCODECTYPE_VP9 0 @@ -549,6 +557,7 @@ +%define CONFIG_CUDA_SDK 0 +%define CONFIG_LIBNPP 0 +%define CONFIG_LIBMFX 0 ++%define CONFIG_LIBVPL 0 +%define CONFIG_MMAL 0 +%define CONFIG_OMX 0 +%define CONFIG_OPENCL 0 @@ -599,7 +608,7 @@ +%define CONFIG_FAST_UNALIGNED 1 +%define CONFIG_FFT 1 +%define CONFIG_LSP 0 -+%define CONFIG_MDCT 1 ++%define CONFIG_MDCT 0 +%define CONFIG_PIXELUTILS 0 +%define CONFIG_NETWORK 0 +%define CONFIG_RDFT 1 @@ -652,7 +661,6 @@ +%define CONFIG_FAANDCT 0 +%define CONFIG_FAANIDCT 0 +%define CONFIG_FDCTDSP 0 -+%define CONFIG_FLACDSP 1 +%define CONFIG_FMTCONVERT 0 +%define CONFIG_FRAME_THREAD_ENCODER 0 +%define CONFIG_G722DSP 0 @@ -671,7 +679,6 @@ +%define CONFIG_HUFFYUVENCDSP 0 +%define CONFIG_IDCTDSP 0 +%define CONFIG_IIRFILTER 0 -+%define CONFIG_MDCT15 1 +%define CONFIG_INFLATE_WRAPPER 0 +%define CONFIG_INTRAX8 0 +%define CONFIG_ISO_MEDIA 1 @@ -693,6 +700,8 @@ +%define CONFIG_MPEGVIDEO 0 +%define CONFIG_MPEGVIDEODEC 0 +%define CONFIG_MPEGVIDEOENC 0 ++%define CONFIG_MSMPEG4DEC 0 ++%define CONFIG_MSMPEG4ENC 0 +%define CONFIG_MSS34DSP 0 +%define CONFIG_PIXBLOCKDSP 0 +%define CONFIG_QPELDSP 0 diff --git a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h index ae6932f12d82..1ee46a2bc530 100644 --- a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h +++ b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h @@ -1,10 +1,10 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h.orig 2022-10-05 07:34:01 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h.orig 2023-03-13 07:33:08 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h -@@ -0,0 +1,739 @@ +@@ -0,0 +1,748 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_H +#define FFMPEG_CONFIG_H -+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/sandersd/src/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" " -- elide long configuration string from binary */ ++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --arch=x86_64 --target-os=openbsd --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +#define FFMPEG_LICENSE "LGPL version 2.1 or later" +#define CONFIG_THIS_YEAR 2022 +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -60,6 +60,7 @@ +#define HAVE_POWER8 0 +#define HAVE_PPC4XX 0 +#define HAVE_VSX 0 ++#define HAVE_RVV 0 +#define HAVE_AESNI 1 +#define HAVE_AMD3DNOW 1 +#define HAVE_AMD3DNOWEXT 1 @@ -108,6 +109,7 @@ +#define HAVE_POWER8_EXTERNAL 0 +#define HAVE_PPC4XX_EXTERNAL 0 +#define HAVE_VSX_EXTERNAL 0 ++#define HAVE_RVV_EXTERNAL 0 +#define HAVE_AESNI_EXTERNAL 1 +#define HAVE_AMD3DNOW_EXTERNAL 1 +#define HAVE_AMD3DNOWEXT_EXTERNAL 1 @@ -156,6 +158,7 @@ +#define HAVE_POWER8_INLINE 0 +#define HAVE_PPC4XX_INLINE 0 +#define HAVE_VSX_INLINE 0 ++#define HAVE_RVV_INLINE 0 +#define HAVE_AESNI_INLINE 1 +#define HAVE_AMD3DNOW_INLINE 1 +#define HAVE_AMD3DNOWEXT_INLINE 1 @@ -194,6 +197,7 @@ +#define HAVE_FAST_64BIT 1 +#define HAVE_FAST_CLZ 1 +#define HAVE_FAST_CMOV 1 ++#define HAVE_FAST_FLOAT16 0 +#define HAVE_LOCAL_ALIGNED 1 +#define HAVE_SIMD_ALIGN_16 1 +#define HAVE_SIMD_ALIGN_32 1 @@ -297,6 +301,7 @@ +#define HAVE_FCNTL 1 +#define HAVE_GETADDRINFO 0 +#define HAVE_GETAUXVAL 0 ++#define HAVE_GETENV 1 +#define HAVE_GETHRTIME 0 +#define HAVE_GETOPT 1 +#define HAVE_GETMODULEHANDLE 0 @@ -325,6 +330,7 @@ +#define HAVE_NANOSLEEP 1 +#define HAVE_PEEKNAMEDPIPE 0 +#define HAVE_POSIX_MEMALIGN 1 ++#define HAVE_PRCTL 0 /* #define HAVE_PRCTL 1 -- forced to 0 for Fuchsia */ +#define HAVE_PTHREAD_CANCEL 1 +#define HAVE_SCHED_GETAFFINITY 0 +#define HAVE_SECITEMIMPORT 0 @@ -370,6 +376,8 @@ +#define HAVE_VFP_ARGS 0 +#define HAVE_XFORM_ASM 0 +#define HAVE_XMM_CLOBBERS 1 ++#define HAVE_DPI_AWARENESS_CONTEXT 0 ++#define HAVE_IDXGIOUTPUT5 0 +#define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0 +#define HAVE_KCMVIDEOCODECTYPE_VP9 0 @@ -565,6 +573,7 @@ +#define CONFIG_CUDA_SDK 0 +#define CONFIG_LIBNPP 0 +#define CONFIG_LIBMFX 0 ++#define CONFIG_LIBVPL 0 +#define CONFIG_MMAL 0 +#define CONFIG_OMX 0 +#define CONFIG_OPENCL 0 @@ -615,7 +624,7 @@ +#define CONFIG_FAST_UNALIGNED 1 +#define CONFIG_FFT 1 +#define CONFIG_LSP 0 -+#define CONFIG_MDCT 1 ++#define CONFIG_MDCT 0 +#define CONFIG_PIXELUTILS 0 +#define CONFIG_NETWORK 0 +#define CONFIG_RDFT 1 @@ -668,7 +677,6 @@ +#define CONFIG_FAANDCT 0 +#define CONFIG_FAANIDCT 0 +#define CONFIG_FDCTDSP 0 -+#define CONFIG_FLACDSP 1 +#define CONFIG_FMTCONVERT 0 +#define CONFIG_FRAME_THREAD_ENCODER 0 +#define CONFIG_G722DSP 0 @@ -687,7 +695,6 @@ +#define CONFIG_HUFFYUVENCDSP 0 +#define CONFIG_IDCTDSP 0 +#define CONFIG_IIRFILTER 0 -+#define CONFIG_MDCT15 1 +#define CONFIG_INFLATE_WRAPPER 0 +#define CONFIG_INTRAX8 0 +#define CONFIG_ISO_MEDIA 1 @@ -709,6 +716,8 @@ +#define CONFIG_MPEGVIDEO 0 +#define CONFIG_MPEGVIDEODEC 0 +#define CONFIG_MPEGVIDEOENC 0 ++#define CONFIG_MSMPEG4DEC 0 ++#define CONFIG_MSMPEG4ENC 0 +#define CONFIG_MSS34DSP 0 +#define CONFIG_PIXBLOCKDSP 0 +#define CONFIG_QPELDSP 0 diff --git a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config__components.h b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config__components.h index ab76c506c0fb..14e2d5aef8e7 100644 --- a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config__components.h +++ b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config__components.h @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config_components.h.orig 2022-10-05 07:34:01 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config_components.h.orig 2023-03-13 07:33:08 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config_components.h -@@ -0,0 +1,2083 @@ +@@ -0,0 +1,2125 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_COMPONENTS_H +#define FFMPEG_CONFIG_COMPONENTS_H @@ -11,6 +11,7 @@ +#define CONFIG_CHOMP_BSF 0 +#define CONFIG_DUMP_EXTRADATA_BSF 0 +#define CONFIG_DCA_CORE_BSF 0 ++#define CONFIG_DTS2PTS_BSF 0 +#define CONFIG_DV_ERROR_MARKER_BSF 0 +#define CONFIG_EAC3_CORE_BSF 0 +#define CONFIG_EXTRACT_EXTRADATA_BSF 0 @@ -165,6 +166,7 @@ +#define CONFIG_M101_DECODER 0 +#define CONFIG_MAGICYUV_DECODER 0 +#define CONFIG_MDEC_DECODER 0 ++#define CONFIG_MEDIA100_DECODER 0 +#define CONFIG_MIMIC_DECODER 0 +#define CONFIG_MJPEG_DECODER 0 +#define CONFIG_MJPEGB_DECODER 0 @@ -214,6 +216,7 @@ +#define CONFIG_PGM_DECODER 0 +#define CONFIG_PGMYUV_DECODER 0 +#define CONFIG_PGX_DECODER 0 ++#define CONFIG_PHM_DECODER 0 +#define CONFIG_PHOTOCD_DECODER 0 +#define CONFIG_PICTOR_DECODER 0 +#define CONFIG_PIXLET_DECODER 0 @@ -224,6 +227,7 @@ +#define CONFIG_PSD_DECODER 0 +#define CONFIG_PTX_DECODER 0 +#define CONFIG_QDRAW_DECODER 0 ++#define CONFIG_QOI_DECODER 0 +#define CONFIG_QPEG_DECODER 0 +#define CONFIG_QTRLE_DECODER 0 +#define CONFIG_R10K_DECODER 0 @@ -305,6 +309,8 @@ +#define CONFIG_VP9_RKMPP_DECODER 0 +#define CONFIG_VP9_V4L2M2M_DECODER 0 +#define CONFIG_VQA_DECODER 0 ++#define CONFIG_VQC_DECODER 0 ++#define CONFIG_WBMP_DECODER 0 +#define CONFIG_WEBP_DECODER 0 +#define CONFIG_WCMV_DECODER 0 +#define CONFIG_WRAPPED_AVFRAME_DECODER 0 @@ -339,6 +345,7 @@ +#define CONFIG_ALS_DECODER 0 +#define CONFIG_AMRNB_DECODER 0 +#define CONFIG_AMRWB_DECODER 0 ++#define CONFIG_APAC_DECODER 0 +#define CONFIG_APE_DECODER 0 +#define CONFIG_APTX_DECODER 0 +#define CONFIG_APTX_HD_DECODER 0 @@ -351,6 +358,7 @@ +#define CONFIG_BINKAUDIO_DCT_DECODER 0 +#define CONFIG_BINKAUDIO_RDFT_DECODER 0 +#define CONFIG_BMV_AUDIO_DECODER 0 ++#define CONFIG_BONK_DECODER 0 +#define CONFIG_COOK_DECODER 0 +#define CONFIG_DCA_DECODER 0 +#define CONFIG_DFPWM_DECODER 0 @@ -367,12 +375,14 @@ +#define CONFIG_FASTAUDIO_DECODER 0 +#define CONFIG_FFWAVESYNTH_DECODER 0 +#define CONFIG_FLAC_DECODER 1 ++#define CONFIG_FTR_DECODER 0 +#define CONFIG_G723_1_DECODER 0 +#define CONFIG_G729_DECODER 0 +#define CONFIG_GSM_DECODER 0 +#define CONFIG_GSM_MS_DECODER 0 +#define CONFIG_HCA_DECODER 0 +#define CONFIG_HCOM_DECODER 0 ++#define CONFIG_HDR_DECODER 0 +#define CONFIG_IAC_DECODER 0 +#define CONFIG_ILBC_DECODER 0 +#define CONFIG_IMC_DECODER 0 @@ -380,6 +390,7 @@ +#define CONFIG_MACE3_DECODER 0 +#define CONFIG_MACE6_DECODER 0 +#define CONFIG_METASOUND_DECODER 0 ++#define CONFIG_MISC4_DECODER 0 +#define CONFIG_MLP_DECODER 0 +#define CONFIG_MP1_DECODER 0 +#define CONFIG_MP1FLOAT_DECODER 0 @@ -631,6 +642,7 @@ +#define CONFIG_H261_ENCODER 0 +#define CONFIG_H263_ENCODER 0 +#define CONFIG_H263P_ENCODER 0 ++#define CONFIG_H264_MEDIACODEC_ENCODER 0 +#define CONFIG_HAP_ENCODER 0 +#define CONFIG_HUFFYUV_ENCODER 0 +#define CONFIG_JPEG2000_ENCODER 0 @@ -650,11 +662,13 @@ +#define CONFIG_PFM_ENCODER 0 +#define CONFIG_PGM_ENCODER 0 +#define CONFIG_PGMYUV_ENCODER 0 ++#define CONFIG_PHM_ENCODER 0 +#define CONFIG_PNG_ENCODER 0 +#define CONFIG_PPM_ENCODER 0 +#define CONFIG_PRORES_ENCODER 0 +#define CONFIG_PRORES_AW_ENCODER 0 +#define CONFIG_PRORES_KS_ENCODER 0 ++#define CONFIG_QOI_ENCODER 0 +#define CONFIG_QTRLE_ENCODER 0 +#define CONFIG_R10K_ENCODER 0 +#define CONFIG_R210_ENCODER 0 @@ -679,6 +693,7 @@ +#define CONFIG_V410_ENCODER 0 +#define CONFIG_VBN_ENCODER 0 +#define CONFIG_VC2_ENCODER 0 ++#define CONFIG_WBMP_ENCODER 0 +#define CONFIG_WRAPPED_AVFRAME_ENCODER 0 +#define CONFIG_WMV1_ENCODER 0 +#define CONFIG_WMV2_ENCODER 0 @@ -700,6 +715,7 @@ +#define CONFIG_EAC3_ENCODER 0 +#define CONFIG_FLAC_ENCODER 0 +#define CONFIG_G723_1_ENCODER 0 ++#define CONFIG_HDR_ENCODER 0 +#define CONFIG_MLP_ENCODER 0 +#define CONFIG_MP2_ENCODER 0 +#define CONFIG_MP2FIXED_ENCODER 0 @@ -811,6 +827,8 @@ +#define CONFIG_AAC_MF_ENCODER 0 +#define CONFIG_AC3_MF_ENCODER 0 +#define CONFIG_H263_V4L2M2M_ENCODER 0 ++#define CONFIG_AV1_NVENC_ENCODER 0 ++#define CONFIG_AV1_QSV_ENCODER 0 +#define CONFIG_LIBOPENH264_ENCODER 0 +#define CONFIG_H264_AMF_ENCODER 0 +#define CONFIG_H264_MF_ENCODER 0 @@ -821,6 +839,7 @@ +#define CONFIG_H264_VAAPI_ENCODER 0 +#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0 +#define CONFIG_HEVC_AMF_ENCODER 0 ++#define CONFIG_HEVC_MEDIACODEC_ENCODER 0 +#define CONFIG_HEVC_MF_ENCODER 0 +#define CONFIG_HEVC_NVENC_ENCODER 0 +#define CONFIG_HEVC_QSV_ENCODER 0 @@ -845,6 +864,7 @@ +#define CONFIG_AV1_DXVA2_HWACCEL 0 +#define CONFIG_AV1_NVDEC_HWACCEL 0 +#define CONFIG_AV1_VAAPI_HWACCEL 0 ++#define CONFIG_AV1_VDPAU_HWACCEL 0 +#define CONFIG_H263_VAAPI_HWACCEL 0 +#define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0 +#define CONFIG_H264_D3D11VA_HWACCEL 0 @@ -921,6 +941,7 @@ +#define CONFIG_DVDSUB_PARSER 0 +#define CONFIG_DVD_NAV_PARSER 0 +#define CONFIG_FLAC_PARSER 1 ++#define CONFIG_FTR_PARSER 0 +#define CONFIG_G723_1_PARSER 0 +#define CONFIG_G729_PARSER 0 +#define CONFIG_GIF_PARSER 0 @@ -929,8 +950,10 @@ +#define CONFIG_H263_PARSER 0 +#define CONFIG_H264_PARSER 1 +#define CONFIG_HEVC_PARSER 0 ++#define CONFIG_HDR_PARSER 0 +#define CONFIG_IPU_PARSER 0 +#define CONFIG_JPEG2000_PARSER 0 ++#define CONFIG_MISC4_PARSER 0 +#define CONFIG_MJPEG_PARSER 0 +#define CONFIG_MLP_PARSER 0 +#define CONFIG_MPEG4VIDEO_PARSER 0 @@ -939,6 +962,7 @@ +#define CONFIG_OPUS_PARSER 1 +#define CONFIG_PNG_PARSER 0 +#define CONFIG_PNM_PARSER 0 ++#define CONFIG_QOI_PARSER 0 +#define CONFIG_RV30_PARSER 0 +#define CONFIG_RV40_PARSER 0 +#define CONFIG_SBC_PARSER 0 @@ -952,6 +976,7 @@ +#define CONFIG_WEBP_PARSER 0 +#define CONFIG_XBM_PARSER 0 +#define CONFIG_XMA_PARSER 0 ++#define CONFIG_XWD_PARSER 0 +#define CONFIG_ALSA_INDEV 0 +#define CONFIG_ANDROID_CAMERA_INDEV 0 +#define CONFIG_AVFOUNDATION_INDEV 0 @@ -1113,9 +1138,11 @@ +#define CONFIG_STEREOWIDEN_FILTER 0 +#define CONFIG_SUPEREQUALIZER_FILTER 0 +#define CONFIG_SURROUND_FILTER 0 ++#define CONFIG_TILTSHELF_FILTER 0 +#define CONFIG_TREBLE_FILTER 0 +#define CONFIG_TREMOLO_FILTER 0 +#define CONFIG_VIBRATO_FILTER 0 ++#define CONFIG_VIRTUALBASS_FILTER 0 +#define CONFIG_VOLUME_FILTER 0 +#define CONFIG_VOLUMEDETECT_FILTER 0 +#define CONFIG_AEVALSRC_FILTER 0 @@ -1136,14 +1163,17 @@ +#define CONFIG_AVGBLUR_FILTER 0 +#define CONFIG_AVGBLUR_OPENCL_FILTER 0 +#define CONFIG_AVGBLUR_VULKAN_FILTER 0 ++#define CONFIG_BACKGROUNDKEY_FILTER 0 +#define CONFIG_BBOX_FILTER 0 +#define CONFIG_BENCH_FILTER 0 +#define CONFIG_BILATERAL_FILTER 0 ++#define CONFIG_BILATERAL_CUDA_FILTER 0 +#define CONFIG_BITPLANENOISE_FILTER 0 +#define CONFIG_BLACKDETECT_FILTER 0 +#define CONFIG_BLACKFRAME_FILTER 0 +#define CONFIG_BLEND_FILTER 0 +#define CONFIG_BLEND_VULKAN_FILTER 0 ++#define CONFIG_BLOCKDETECT_FILTER 0 +#define CONFIG_BLURDETECT_FILTER 0 +#define CONFIG_BM3D_FILTER 0 +#define CONFIG_BOXBLUR_FILTER 0 @@ -1153,6 +1183,7 @@ +#define CONFIG_CHROMABER_VULKAN_FILTER 0 +#define CONFIG_CHROMAHOLD_FILTER 0 +#define CONFIG_CHROMAKEY_FILTER 0 ++#define CONFIG_CHROMAKEY_CUDA_FILTER 0 +#define CONFIG_CHROMANR_FILTER 0 +#define CONFIG_CHROMASHIFT_FILTER 0 +#define CONFIG_CIESCOPE_FILTER 0 @@ -1169,6 +1200,7 @@ +#define CONFIG_COLORMAP_FILTER 0 +#define CONFIG_COLORMATRIX_FILTER 0 +#define CONFIG_COLORSPACE_FILTER 0 ++#define CONFIG_COLORSPACE_CUDA_FILTER 0 +#define CONFIG_COLORTEMPERATURE_FILTER 0 +#define CONFIG_CONVOLUTION_FILTER 0 +#define CONFIG_CONVOLUTION_OPENCL_FILTER 0 @@ -1357,6 +1389,7 @@ +#define CONFIG_READVITC_FILTER 0 +#define CONFIG_REALTIME_FILTER 0 +#define CONFIG_REMAP_FILTER 0 ++#define CONFIG_REMAP_OPENCL_FILTER 0 +#define CONFIG_REMOVEGRAIN_FILTER 0 +#define CONFIG_REMOVELOGO_FILTER 0 +#define CONFIG_REPEATFIELDS_FILTER 0 @@ -1479,6 +1512,7 @@ +#define CONFIG_COLORCHART_FILTER 0 +#define CONFIG_COLORSPECTRUM_FILTER 0 +#define CONFIG_COREIMAGESRC_FILTER 0 ++#define CONFIG_DDAGRAB_FILTER 0 +#define CONFIG_FREI0R_SRC_FILTER 0 +#define CONFIG_GRADIENTS_FILTER 0 +#define CONFIG_HALDCLUTSRC_FILTER 0 @@ -1497,6 +1531,7 @@ +#define CONFIG_TESTSRC2_FILTER 0 +#define CONFIG_YUVTESTSRC_FILTER 0 +#define CONFIG_NULLSINK_FILTER 0 ++#define CONFIG_A3DSCOPE_FILTER 0 +#define CONFIG_ABITSCOPE_FILTER 0 +#define CONFIG_ADRAWGRAPH_FILTER 0 +#define CONFIG_AGRAPHMONITOR_FILTER 0 @@ -1538,6 +1573,7 @@ +#define CONFIG_AMRNB_DEMUXER 0 +#define CONFIG_AMRWB_DEMUXER 0 +#define CONFIG_ANM_DEMUXER 0 ++#define CONFIG_APAC_DEMUXER 0 +#define CONFIG_APC_DEMUXER 0 +#define CONFIG_APE_DEMUXER 0 +#define CONFIG_APM_DEMUXER 0 @@ -1571,6 +1607,7 @@ +#define CONFIG_BFSTM_DEMUXER 0 +#define CONFIG_BRSTM_DEMUXER 0 +#define CONFIG_BOA_DEMUXER 0 ++#define CONFIG_BONK_DEMUXER 0 +#define CONFIG_C93_DEMUXER 0 +#define CONFIG_CAF_DEMUXER 0 +#define CONFIG_CAVSVIDEO_DEMUXER 0 @@ -1655,6 +1692,7 @@ +#define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 +#define CONFIG_KVAG_DEMUXER 0 ++#define CONFIG_LAF_DEMUXER 0 +#define CONFIG_LMLM4_DEMUXER 0 +#define CONFIG_LOAS_DEMUXER 0 +#define CONFIG_LUODAT_DEMUXER 0 @@ -1827,6 +1865,7 @@ +#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_HDR_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0 @@ -1834,15 +1873,18 @@ +#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PFM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PGX_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PHM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PSD_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_QOI_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_SVG_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0 diff --git a/www/iridium/files/patch-third__party_libsync_src_sync.c b/www/iridium/files/patch-third__party_libsync_src_sync.c index d3e88306a998..5c8024092c16 100644 --- a/www/iridium/files/patch-third__party_libsync_src_sync.c +++ b/www/iridium/files/patch-third__party_libsync_src_sync.c @@ -1,18 +1,16 @@ ---- third_party/libsync/src/sync.c.orig 2023-01-17 19:19:00 UTC +--- third_party/libsync/src/sync.c.orig 2023-03-13 07:33:08 UTC +++ third_party/libsync/src/sync.c -@@ -17,7 +17,11 @@ +@@ -17,7 +17,9 @@ */ #include <fcntl.h> -+#if defined(__OpenBSD__) -+#include <stdlib.h> -+#else ++#if !defined(__OpenBSD__) #include <malloc.h> +#endif #include <stdint.h> #include <string.h> #include <errno.h> -@@ -29,6 +33,12 @@ +@@ -29,6 +31,12 @@ #include <sync/sync.h> diff --git a/www/iridium/files/patch-third__party_libusb_src_libusb_os_threads__posix.c b/www/iridium/files/patch-third__party_libusb_src_libusb_os_threads__posix.c new file mode 100644 index 000000000000..20926fa54645 --- /dev/null +++ b/www/iridium/files/patch-third__party_libusb_src_libusb_os_threads__posix.c @@ -0,0 +1,24 @@ +--- third_party/libusb/src/libusb/os/threads_posix.c.orig 2023-03-13 07:33:08 UTC ++++ third_party/libusb/src/libusb/os/threads_posix.c +@@ -19,9 +19,11 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +-#if defined(__linux__) || defined(__OpenBSD__) ++#if defined(__linux__) + # include <unistd.h> + # include <sys/syscall.h> ++#elif defined(__OpenBSD__) ++# include <unistd.h> + #elif defined(__APPLE__) + # include <mach/mach.h> + #elif defined(__CYGWIN__) +@@ -65,7 +67,7 @@ int usbi_get_tid(void) + #elif defined(__OpenBSD__) + /* The following only works with OpenBSD > 5.1 as it requires + real thread support. For 5.1 and earlier, -1 is returned. */ +- ret = syscall(SYS_getthrid); ++ ret = getthrid(); + #elif defined(__APPLE__) + ret = mach_thread_self(); + mach_port_deallocate(mach_task_self(), ret); diff --git a/www/iridium/files/patch-third__party_libxml_src_dict.c b/www/iridium/files/patch-third__party_libxml_src_dict.c index d58498be06df..d488a68f643f 100644 --- a/www/iridium/files/patch-third__party_libxml_src_dict.c +++ b/www/iridium/files/patch-third__party_libxml_src_dict.c @@ -1,7 +1,7 @@ ---- third_party/libxml/src/dict.c.orig 2022-12-01 10:35:46 UTC +--- third_party/libxml/src/dict.c.orig 2023-03-13 07:33:08 UTC +++ third_party/libxml/src/dict.c -@@ -137,7 +137,7 @@ static xmlMutexPtr xmlDictMutex = NULL; - static int xmlDictInitialized = 0; +@@ -133,7 +133,7 @@ struct _xmlDict { + static xmlMutex xmlDictMutex; #ifdef DICT_RANDOMIZATION -#ifdef HAVE_RAND_R @@ -9,23 +9,23 @@ /* * Internal data for random function, protected by xmlDictMutex */ -@@ -180,7 +180,7 @@ int __xmlInitializeDict(void) { - return(0); - xmlMutexLock(xmlDictMutex); +@@ -160,7 +160,7 @@ int xmlInitializeDict(void) { + int __xmlInitializeDict(void) { + xmlInitMutex(&xmlDictMutex); -#ifdef DICT_RANDOMIZATION +#if defined(DICT_RANDOMIZATION) && !defined(HAVE_ARC4RANDOM) #ifdef HAVE_RAND_R rand_seed = time(NULL); rand_r(& rand_seed); -@@ -200,13 +200,17 @@ int __xmlRandom(void) { - if (xmlDictInitialized == 0) - __xmlInitializeDict(); +@@ -175,13 +175,17 @@ int __xmlInitializeDict(void) { + int __xmlRandom(void) { + int ret; +#ifdef HAVE_ARC4RANDOM + ret = arc4random(); +#else - xmlMutexLock(xmlDictMutex); + xmlMutexLock(&xmlDictMutex); -#ifdef HAVE_RAND_R +# ifdef HAVE_RAND_R ret = rand_r(& rand_seed); @@ -34,7 +34,7 @@ ret = rand(); -#endif +# endif - xmlMutexUnlock(xmlDictMutex); + xmlMutexUnlock(&xmlDictMutex); +#endif return(ret); } diff --git a/www/iridium/files/patch-third__party_pdfium_pdfium.gni b/www/iridium/files/patch-third__party_pdfium_pdfium.gni new file mode 100644 index 000000000000..64ab6a4bb395 --- /dev/null +++ b/www/iridium/files/patch-third__party_pdfium_pdfium.gni @@ -0,0 +1,11 @@ +--- third_party/pdfium/pdfium.gni.orig 2023-03-13 07:33:08 UTC ++++ third_party/pdfium/pdfium.gni +@@ -42,7 +42,7 @@ declare_args() { + pdf_use_cxx20 = is_win && is_component_build + + # Build PDFium with PartitionAlloc as the memory allocator. +- pdf_use_partition_alloc = pdf_use_partition_alloc_override ++ pdf_use_partition_alloc = pdf_use_partition_alloc_override && use_partition_alloc_as_malloc + + # Build PDFium to use Skia (experimental) for all PDFium graphics. + # If enabled, coexists in build with AGG graphics and the default 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 98091fcc7969..3d03c94562f4 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 2022-03-28 18:11:04 UTC +--- third_party/perfetto/include/perfetto/base/time.h.orig 2023-03-13 07:33:08 UTC +++ third_party/perfetto/include/perfetto/base/time.h -@@ -142,6 +142,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) { +@@ -157,6 +157,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 = {}; -@@ -149,6 +152,7 @@ inline TimeNanos GetBootTimeNs() { +@@ -164,6 +167,7 @@ inline TimeNanos GetBootTimeNs() { return res == 0 ? CLOCK_BOOTTIME : kWallTimeClockSource; }(); return GetTimeInternalNs(kBootTimeClockSource); @@ -18,3 +18,17 @@ } inline TimeNanos GetWallTimeNs() { +@@ -171,7 +175,13 @@ inline TimeNanos GetWallTimeNs() { + } + + inline TimeNanos GetWallTimeRawNs() { ++#if defined(__OpenBSD__) ++ return GetTimeInternalNs(CLOCK_MONOTONIC); ++#elif defined(__FreeBSD__) ++ return GetTimeInternalNs(CLOCK_MONOTONIC_FAST); ++#else + return GetTimeInternalNs(CLOCK_MONOTONIC_RAW); ++#endif + } + + inline TimeNanos GetThreadCPUTimeNs() { diff --git a/www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc index 4e9c684cff7c..6829270a7a2f 100644 --- a/www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc +++ b/www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2023-01-17 19:19:00 UTC +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2023-03-13 07:33:08 UTC +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -3039,7 +3039,8 @@ bool TracingServiceImpl::SnapshotClocks( +@@ -3080,7 +3080,8 @@ bool TracingServiceImpl::SnapshotClocks( #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \ !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ diff --git a/www/iridium/files/patch-third__party_skia_src_core_SkContainers.cpp b/www/iridium/files/patch-third__party_skia_src_base_SkContainers.cpp index 71d6fe083ce1..e8aa8c32888c 100644 --- a/www/iridium/files/patch-third__party_skia_src_core_SkContainers.cpp +++ b/www/iridium/files/patch-third__party_skia_src_base_SkContainers.cpp @@ -1,6 +1,6 @@ ---- third_party/skia/src/core/SkContainers.cpp.orig 2023-01-17 19:19:00 UTC -+++ third_party/skia/src/core/SkContainers.cpp -@@ -13,7 +13,7 @@ +--- third_party/skia/src/base/SkContainers.cpp.orig 2023-03-13 07:33:08 UTC ++++ third_party/skia/src/base/SkContainers.cpp +@@ -14,7 +14,7 @@ #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #include <malloc.h> #elif defined(SK_BUILD_FOR_WIN) #include <malloc.h> -@@ -37,7 +37,7 @@ SkSpan<std::byte> complete_size(void* ptr, size_t size +@@ -38,7 +38,7 @@ SkSpan<std::byte> complete_size(void* ptr, size_t size #elif defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 17 completeSize = malloc_usable_size(ptr); SkASSERT(completeSize >= size); diff --git a/www/iridium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/www/iridium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c index dfa6da49bb2d..2ed1b8c7004a 100644 --- a/www/iridium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c +++ b/www/iridium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c @@ -1,6 +1,6 @@ ---- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2022-10-05 07:34:01 UTC +--- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2023-03-13 07:33:08 UTC +++ third_party/sqlite/src/amalgamation/sqlite3.c -@@ -42109,7 +42109,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -43302,7 +43302,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB memset(zBuf, 0, nBuf); randomnessPid = osGetpid(0); #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS) @@ -13,7 +13,7 @@ int fd, got; fd = robust_open("/dev/urandom", O_RDONLY, 0); if( fd<0 ){ -@@ -42124,6 +42129,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -43317,6 +43322,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB robust_close(0, fd, __LINE__); } } diff --git a/www/iridium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn b/www/iridium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn deleted file mode 100644 index 3ffebd0276b8..000000000000 --- a/www/iridium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/swiftshader/src/WSI/BUILD.gn.orig 2022-12-06 08:09:13 UTC -+++ third_party/swiftshader/src/WSI/BUILD.gn -@@ -87,7 +87,7 @@ swiftshader_source_set("WSI") { - "../Vulkan:swiftshader_libvulkan_headers", - ] - -- if (is_linux && ozone_platform_wayland && !use_system_libwayland) { -+ if (is_linux && ozone_platform_wayland && !use_system_libwayland && !is_openbsd) { - # Use third-party targets - deps += [ "$wayland_gn_dir:wayland_client" ] - } diff --git a/www/iridium/files/patch-third__party_swiftshader_src_WSI_libXCB.cpp b/www/iridium/files/patch-third__party_swiftshader_src_WSI_libXCB.cpp index 2f01f621d4da..5aa010c4e7d2 100644 --- a/www/iridium/files/patch-third__party_swiftshader_src_WSI_libXCB.cpp +++ b/www/iridium/files/patch-third__party_swiftshader_src_WSI_libXCB.cpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/WSI/libXCB.cpp.orig 2022-10-05 07:34:01 UTC +--- third_party/swiftshader/src/WSI/libXCB.cpp.orig 2023-03-13 07:33:08 UTC +++ third_party/swiftshader/src/WSI/libXCB.cpp -@@ -55,7 +55,7 @@ LibXcbExports *LibXCB::loadExports() +@@ -57,7 +57,7 @@ LibXcbExports *LibXCB::loadExports() } else { @@ -9,7 +9,7 @@ } if(getProcAddress(RTLD_DEFAULT, "xcb_shm_query_version")) // Search the global scope for pre-loaded XCB library. -@@ -64,7 +64,7 @@ LibXcbExports *LibXCB::loadExports() +@@ -66,7 +66,7 @@ LibXcbExports *LibXCB::loadExports() } else { diff --git a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__mem__alloc.h b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__mem__alloc.h index cf5a0a6d7d99..ea6bccbcf638 100644 --- a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__mem__alloc.h +++ b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__mem__alloc.h @@ -1,6 +1,6 @@ ---- third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_mem_alloc.h.orig 2022-12-01 10:35:46 UTC +--- third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_mem_alloc.h.orig 2023-03-13 07:33:08 UTC +++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_mem_alloc.h -@@ -2700,7 +2700,7 @@ static void* vma_aligned_alloc(size_t alignment, size_ +@@ -2703,7 +2703,7 @@ static void* vma_aligned_alloc(size_t alignment, size_ return memalign(alignment, size); } diff --git a/www/iridium/files/patch-third__party_wayland_BUILD.gn b/www/iridium/files/patch-third__party_wayland_BUILD.gn new file mode 100644 index 000000000000..ecf35f92286c --- /dev/null +++ b/www/iridium/files/patch-third__party_wayland_BUILD.gn @@ -0,0 +1,14 @@ +--- third_party/wayland/BUILD.gn.orig 2023-03-13 07:33:08 UTC ++++ third_party/wayland/BUILD.gn +@@ -22,6 +22,11 @@ config("wayland_config") { + "src/src", + ] + ++ if (is_bsd) { ++ include_dirs += [ "/usr/local/include/libepoll-shim" ] ++ libs = [ "epoll-shim" ] ++ } ++ + # Client/Server headers are automatically generated. Though, we still need + # to pass the path where these headers are located. + include_dirs += [ "$root_gen_dir/third_party/wayland/src/protocol" ] diff --git a/www/iridium/files/patch-third__party_wayland_features.gni b/www/iridium/files/patch-third__party_wayland_features.gni deleted file mode 100644 index e041e395d675..000000000000 --- a/www/iridium/files/patch-third__party_wayland_features.gni +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/wayland/features.gni.orig 2022-12-06 08:09:13 UTC -+++ third_party/wayland/features.gni -@@ -21,12 +21,15 @@ declare_args() { - - declare_args() { - # Path to the wayland-scanner in the sysroot. -- assert(host_os == "linux") - if (use_system_wayland_scanner) { - if (use_sysroot) { - system_wayland_scanner_path = "$sysroot/usr/bin/wayland-scanner" - } else { -- system_wayland_scanner_path = "/usr/bin/wayland-scanner" -+ if (is_bsd) { -+ system_wayland_scanner_path = "/usr/local/bin/wayland-scanner" -+ } else { -+ system_wayland_scanner_path = "/usr/bin/wayland-scanner" -+ } - } - } - } diff --git a/www/iridium/files/patch-third__party_wayland_include_config.h b/www/iridium/files/patch-third__party_wayland_include_config.h new file mode 100644 index 000000000000..4275b5ab44b4 --- /dev/null +++ b/www/iridium/files/patch-third__party_wayland_include_config.h @@ -0,0 +1,29 @@ +--- third_party/wayland/include/config.h.orig 2023-03-13 07:33:08 UTC ++++ third_party/wayland/include/config.h +@@ -9,7 +9,14 @@ + + #define HAVE_BROKEN_MSG_CMSG_CLOEXEC 0 + ++#if defined(__FreeBSD__) ++#include <osreldate.h> ++#if defined(__FreeBSD_version) && __FreeBSD_version < 1300048 ++#undef HAVE_MEMFD_CREATE ++#else + #define HAVE_MEMFD_CREATE ++#endif ++#endif + + #define HAVE_MKOSTEMP + +@@ -25,7 +32,11 @@ + + #undef HAVE_SYS_PROCCTL_H + ++#if defined(__FreeBSD__) ++#define HAVE_SYS_UCRED_H ++#else + #undef HAVE_SYS_UCRED_H ++#endif + + #define HAVE_XUCRED_CR_PID 0 + diff --git a/www/iridium/files/patch-third__party_webrtc_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_BUILD.gn index 720e8fa72764..f67e8b641f8e 100644 --- a/www/iridium/files/patch-third__party_webrtc_BUILD.gn +++ b/www/iridium/files/patch-third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/BUILD.gn.orig 2023-01-17 19:19:00 UTC +--- third_party/webrtc/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ third_party/webrtc/BUILD.gn -@@ -208,6 +208,9 @@ config("common_inherited_config") { +@@ -211,6 +211,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/iridium/files/patch-third__party_webrtc__overrides_metronome__source.h b/www/iridium/files/patch-third__party_webrtc__overrides_metronome__source.h deleted file mode 100644 index a285936f1406..000000000000 --- a/www/iridium/files/patch-third__party_webrtc__overrides_metronome__source.h +++ /dev/null @@ -1,10 +0,0 @@ ---- third_party/webrtc_overrides/metronome_source.h.orig 2023-01-17 19:19:00 UTC -+++ third_party/webrtc_overrides/metronome_source.h -@@ -7,6 +7,7 @@ - - #include <atomic> - #include <set> -+#include <vector> - - #include "base/callback.h" - #include "base/memory/ref_counted.h" diff --git a/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn index 44554fdee39e..ebe7b6fc3405 100644 --- a/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn +++ b/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ third_party/webrtc/modules/audio_device/BUILD.gn -@@ -299,7 +299,7 @@ rtc_library("audio_device_impl") { +@@ -300,7 +300,7 @@ rtc_library("audio_device_impl") { if (rtc_use_dummy_audio_file_devices) { defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] } else { diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_rtc__base_BUILD.gn deleted file mode 100644 index a66baa8ba3c2..000000000000 --- a/www/iridium/files/patch-third__party_webrtc_rtc__base_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/webrtc/rtc_base/BUILD.gn.orig 2023-01-17 19:19:00 UTC -+++ third_party/webrtc/rtc_base/BUILD.gn -@@ -1245,7 +1245,7 @@ rtc_library("rtc_base") { - sources += [ "mac_ifaddrs_converter.cc" ] - } - -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - libs += [ - "dl", - "rt", diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_byte__order.h b/www/iridium/files/patch-third__party_webrtc_rtc__base_byte__order.h index 35c9376a723a..8a636a1479ee 100644 --- a/www/iridium/files/patch-third__party_webrtc_rtc__base_byte__order.h +++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_byte__order.h @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/byte_order.h.orig 2022-03-28 18:11:04 UTC +--- third_party/webrtc/rtc_base/byte_order.h.orig 2023-03-13 07:33:08 UTC +++ third_party/webrtc/rtc_base/byte_order.h -@@ -88,6 +88,8 @@ +@@ -90,6 +90,8 @@ #error WEBRTC_ARCH_BIG_ENDIAN or WEBRTC_ARCH_LITTLE_ENDIAN must be defined. #endif // defined(WEBRTC_ARCH_LITTLE_ENDIAN) diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc index b6536a052b91..3b40c462fed8 100644 --- a/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc +++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/network.cc.orig 2022-12-06 08:09:13 UTC +--- third_party/webrtc/rtc_base/network.cc.orig 2023-03-13 07:33:08 UTC +++ third_party/webrtc/rtc_base/network.cc -@@ -286,7 +286,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n +@@ -288,7 +288,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n } #endif diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc b/www/iridium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc index 73c026f505e1..41def420756c 100644 --- a/www/iridium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc +++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2023-03-13 07:33:08 UTC +++ third_party/webrtc/rtc_base/platform_thread_types.cc @@ -11,7 +11,9 @@ #include "rtc_base/platform_thread_types.h" @@ -10,19 +10,16 @@ #include <sys/syscall.h> #endif -@@ -37,8 +39,10 @@ PlatformThreadId CurrentThreadId() { +@@ -44,6 +46,8 @@ PlatformThreadId CurrentThreadId() { return gettid(); #elif defined(WEBRTC_FUCHSIA) return zx_thread_self(); --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) - return syscall(__NR_gettid); +#elif defined(WEBRTC_BSD) + return reinterpret_cast<uint64_t>(pthread_self()); + #elif defined(WEBRTC_LINUX) + return syscall(__NR_gettid); #elif defined(__EMSCRIPTEN__) - return static_cast<PlatformThreadId>(pthread_self()); - #else -@@ -67,6 +71,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons +@@ -74,6 +78,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons } void SetCurrentThreadName(const char* name) { @@ -30,10 +27,10 @@ #if defined(WEBRTC_WIN) // The SetThreadDescription API works even if no debugger is attached. // The names set with this API also show up in ETW traces. Very handy. -@@ -109,6 +114,7 @@ void SetCurrentThreadName(const char* name) { - prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name)); // NOLINT - #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS) - pthread_setname_np(name); +@@ -120,6 +125,7 @@ void SetCurrentThreadName(const char* name) { + zx_status_t status = zx_object_set_property(zx_thread_self(), ZX_PROP_NAME, + name, strlen(name)); + RTC_DCHECK_EQ(status, ZX_OK); +#endif #endif } 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 3d1f38cd3eb3..c84ab6507111 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 2022-10-05 07:34:01 UTC +--- tools/json_schema_compiler/cpp_bundle_generator.py.orig 2023-03-13 07:33:08 UTC +++ tools/json_schema_compiler/cpp_bundle_generator.py -@@ -153,7 +153,7 @@ class CppBundleGenerator(object): +@@ -149,7 +149,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 ba15352ccb00..a06d68ff6851 100644 --- a/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py +++ b/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py @@ -1,6 +1,6 @@ ---- tools/json_schema_compiler/feature_compiler.py.orig 2023-01-17 19:19:00 UTC +--- tools/json_schema_compiler/feature_compiler.py.orig 2023-03-13 07:33:08 UTC +++ tools/json_schema_compiler/feature_compiler.py -@@ -268,6 +268,8 @@ FEATURE_GRAMMAR = ({ +@@ -266,6 +266,8 @@ FEATURE_GRAMMAR = ({ 'linux': 'Feature::LINUX_PLATFORM', 'mac': 'Feature::MACOSX_PLATFORM', 'win': 'Feature::WIN_PLATFORM', diff --git a/www/iridium/files/patch-tools_protoc__wrapper_protoc__wrapper.py b/www/iridium/files/patch-tools_protoc__wrapper_protoc__wrapper.py index 09a7b5d04390..2bdc2d448564 100644 --- a/www/iridium/files/patch-tools_protoc__wrapper_protoc__wrapper.py +++ b/www/iridium/files/patch-tools_protoc__wrapper_protoc__wrapper.py @@ -1,6 +1,6 @@ ---- tools/protoc_wrapper/protoc_wrapper.py.orig 2023-01-17 19:19:00 UTC +--- tools/protoc_wrapper/protoc_wrapper.py.orig 2023-03-13 07:33:08 UTC +++ tools/protoc_wrapper/protoc_wrapper.py -@@ -182,15 +182,19 @@ def main(argv): +@@ -175,15 +175,19 @@ def main(argv): if not options.exclude_imports: protoc_cmd += ["--include_imports"] diff --git a/www/iridium/files/patch-ui_aura_screen__ozone.cc b/www/iridium/files/patch-ui_aura_screen__ozone.cc index 25bec6781d87..c5553216df45 100644 --- a/www/iridium/files/patch-ui_aura_screen__ozone.cc +++ b/www/iridium/files/patch-ui_aura_screen__ozone.cc @@ -1,6 +1,6 @@ ---- ui/aura/screen_ozone.cc.orig 2022-10-05 07:34:01 UTC +--- ui/aura/screen_ozone.cc.orig 2023-03-13 07:33:08 UTC +++ ui/aura/screen_ozone.cc -@@ -109,7 +109,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons +@@ -110,7 +110,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons return platform_screen_->GetPrimaryDisplay(); } diff --git a/www/iridium/files/patch-ui_aura_screen__ozone.h b/www/iridium/files/patch-ui_aura_screen__ozone.h index 7f91d49a5563..3e60a1e6114f 100644 --- a/www/iridium/files/patch-ui_aura_screen__ozone.h +++ b/www/iridium/files/patch-ui_aura_screen__ozone.h @@ -1,4 +1,4 @@ ---- ui/aura/screen_ozone.h.orig 2022-12-01 10:35:46 UTC +--- ui/aura/screen_ozone.h.orig 2023-03-13 07:33:08 UTC +++ ui/aura/screen_ozone.h @@ -46,7 +46,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen display::Display GetDisplayMatching( @@ -9,7 +9,7 @@ std::unique_ptr<display::Screen::ScreenSaverSuspender> SuspendScreenSaver() override; #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -@@ -71,7 +71,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen +@@ -73,7 +73,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen ui::PlatformScreen* platform_screen() { return platform_screen_.get(); } private: 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 23031858002b..3dad09fc9934 100644 --- a/www/iridium/files/patch-ui_base_clipboard_clipboard__constants.h +++ b/www/iridium/files/patch-ui_base_clipboard_clipboard__constants.h @@ -1,9 +1,9 @@ ---- ui/base/clipboard/clipboard_constants.h.orig 2022-04-01 07:48:30 UTC +--- ui/base/clipboard/clipboard_constants.h.orig 2023-03-13 07:33:08 UTC +++ ui/base/clipboard/clipboard_constants.h -@@ -46,7 +46,7 @@ extern const char kMimeTypeDataTransferEndpoint[]; - #endif // BUILDFLAG(IS_CHROMEOS) +@@ -47,7 +47,7 @@ extern const char kMimeTypeDataTransferEndpoint[]; + + // ----- LINUX & CHROMEOS & FUCHSIA MIME TYPES ----- - // Linux-specific MIME type constants (also used in Fuchsia). -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) diff --git a/www/iridium/files/patch-ui_base_cursor_cursor__factory.cc b/www/iridium/files/patch-ui_base_cursor_cursor__factory.cc index 75a46cffa1c2..6cb819cb764e 100644 --- a/www/iridium/files/patch-ui_base_cursor_cursor__factory.cc +++ b/www/iridium/files/patch-ui_base_cursor_cursor__factory.cc @@ -1,6 +1,6 @@ ---- ui/base/cursor/cursor_factory.cc.orig 2022-10-05 07:34:01 UTC +--- ui/base/cursor/cursor_factory.cc.orig 2023-03-13 07:33:08 UTC +++ ui/base/cursor/cursor_factory.cc -@@ -83,7 +83,7 @@ void CursorFactory::ObserveThemeChanges() { +@@ -89,7 +89,7 @@ void CursorFactory::ObserveThemeChanges() { void CursorFactory::SetDeviceScaleFactor(float scale) {} diff --git a/www/iridium/files/patch-ui_base_cursor_cursor__factory.h b/www/iridium/files/patch-ui_base_cursor_cursor__factory.h index a65282530004..ae11a72e7805 100644 --- a/www/iridium/files/patch-ui_base_cursor_cursor__factory.h +++ b/www/iridium/files/patch-ui_base_cursor_cursor__factory.h @@ -1,6 +1,6 @@ ---- ui/base/cursor/cursor_factory.h.orig 2022-03-28 18:11:04 UTC +--- ui/base/cursor/cursor_factory.h.orig 2023-03-13 07:33:08 UTC +++ ui/base/cursor/cursor_factory.h -@@ -81,7 +81,7 @@ class COMPONENT_EXPORT(UI_BASE_CURSOR) CursorFactory { +@@ -88,7 +88,7 @@ class COMPONENT_EXPORT(UI_BASE_CURSOR) CursorFactory { base::ObserverList<CursorFactoryObserver>::Unchecked observers_; }; 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 92ab79a7134f..c6d86e608c0a 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 2022-10-05 07:34:01 UTC +--- ui/base/resource/resource_bundle.cc.orig 2023-03-13 07:33:08 UTC +++ ui/base/resource/resource_bundle.cc -@@ -884,7 +884,7 @@ void ResourceBundle::ReloadFonts() { +@@ -885,7 +885,7 @@ void ResourceBundle::ReloadFonts() { } ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const { 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 6f1ab68ddd96..6bea9c0b351d 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 2023-01-17 19:19:00 UTC +--- ui/base/ui_base_features.cc.orig 2023-03-13 07:33:08 UTC +++ ui/base/ui_base_features.cc -@@ -205,7 +205,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, +@@ -210,7 +210,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -307,7 +307,7 @@ bool IsForcedColorsEnabled() { +@@ -315,7 +315,7 @@ bool IsForcedColorsEnabled() { // milestones. BASE_FEATURE(kEyeDropper, "EyeDropper", 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 bc3c6df2ac22..7ca18537b974 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 2022-12-06 08:09:13 UTC +--- ui/base/webui/web_ui_util.cc.orig 2023-03-13 07:33:08 UTC +++ ui/base/webui/web_ui_util.cc -@@ -218,7 +218,7 @@ std::string GetFontFamily() { +@@ -212,7 +212,7 @@ std::string GetFontFamily() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/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 d9f05cfeab8f..de836a1af833 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,14 +1,14 @@ ---- ui/base/x/x11_shm_image_pool.cc.orig 2022-03-28 18:11:04 UTC +--- ui/base/x/x11_shm_image_pool.cc.orig 2023-03-13 07:33:08 UTC +++ ui/base/x/x11_shm_image_pool.cc @@ -16,6 +16,7 @@ - #include "base/environment.h" + #include "base/functional/callback.h" #include "base/location.h" #include "base/strings/string_util.h" +#include "base/system/sys_info.h" - #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" -@@ -46,10 +47,14 @@ constexpr float kShmResizeShrinkThreshold = + #include "net/base/url_util.h" +@@ -45,10 +46,14 @@ constexpr float kShmResizeShrinkThreshold = 1.0f / (kShmResizeThreshold * kShmResizeThreshold); std::size_t MaxShmSegmentSizeImpl() { @@ -23,7 +23,7 @@ } std::size_t MaxShmSegmentSize() { -@@ -66,6 +71,9 @@ bool IsRemoteHost(const std::string& name) { +@@ -65,6 +70,9 @@ bool IsRemoteHost(const std::string& name) { } bool ShouldUseMitShm(x11::Connection* connection) { @@ -33,7 +33,7 @@ // 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 -@@ -184,7 +192,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size +@@ -183,7 +191,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size shmctl(state.shmid, IPC_RMID, nullptr); return false; } @@ -42,7 +42,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. -@@ -203,7 +211,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size +@@ -202,7 +210,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 9de9a94ef73c..f7cc95288a46 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 2023-01-17 19:19:00 UTC +--- ui/color/color_id.h.orig 2023-03-13 07:33:08 UTC +++ ui/color/color_id.h -@@ -364,7 +364,7 @@ +@@ -414,7 +414,7 @@ E_CPONLY(kColorNativeColor6) \ E_CPONLY(kColorNativeBaseColor) \ E_CPONLY(kColorNativeSecondaryColor) diff --git a/www/iridium/files/patch-ui_compositor_compositor.cc b/www/iridium/files/patch-ui_compositor_compositor.cc index e9a8d252987d..6e110b2e9690 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 2023-01-17 19:19:00 UTC +--- ui/compositor/compositor.cc.orig 2023-03-13 07:33:08 UTC +++ ui/compositor/compositor.cc -@@ -864,7 +864,7 @@ void Compositor::OnResume() { +@@ -887,7 +887,7 @@ void Compositor::OnResume() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-ui_compositor_compositor.h b/www/iridium/files/patch-ui_compositor_compositor.h index 6bfdc4383712..adb17bca8fb2 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 2023-01-17 19:19:00 UTC +--- ui/compositor/compositor.h.orig 2023-03-13 07:33:08 UTC +++ ui/compositor/compositor.h -@@ -430,7 +430,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe +@@ -446,7 +446,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-ui_display_screen.h b/www/iridium/files/patch-ui_display_screen.h index faf392ff0747..77428f2defdd 100644 --- a/www/iridium/files/patch-ui_display_screen.h +++ b/www/iridium/files/patch-ui_display_screen.h @@ -1,6 +1,6 @@ ---- ui/display/screen.h.orig 2022-12-01 10:35:46 UTC +--- ui/display/screen.h.orig 2023-03-13 07:33:08 UTC +++ ui/display/screen.h -@@ -130,7 +130,7 @@ class DISPLAY_EXPORT Screen { +@@ -131,7 +131,7 @@ class DISPLAY_EXPORT Screen { // (both of which may or may not be `nearest_id`). display::ScreenInfos GetScreenInfosNearestDisplay(int64_t nearest_id) const; @@ -9,7 +9,7 @@ // Object which suspends the platform-specific screensaver for the duration of // its existence. class ScreenSaverSuspender { -@@ -220,7 +220,7 @@ class DISPLAY_EXPORT Screen { +@@ -232,7 +232,7 @@ class DISPLAY_EXPORT Screen { int64_t display_id_for_new_windows_; int64_t scoped_display_id_for_new_windows_ = display::kInvalidDisplayId; diff --git a/www/iridium/files/patch-ui_gfx_BUILD.gn b/www/iridium/files/patch-ui_gfx_BUILD.gn index 3bff7de9cd88..27b072f76e15 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 2022-12-06 08:09:13 UTC +--- ui/gfx/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ ui/gfx/BUILD.gn -@@ -593,7 +593,7 @@ source_set("memory_buffer_sources") { +@@ -594,7 +594,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/iridium/files/patch-ui_gl_BUILD.gn b/www/iridium/files/patch-ui_gl_BUILD.gn index e865308b3652..6f2d8743960b 100644 --- a/www/iridium/files/patch-ui_gl_BUILD.gn +++ b/www/iridium/files/patch-ui_gl_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gl/BUILD.gn.orig 2023-01-17 19:19:00 UTC +--- ui/gl/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ ui/gl/BUILD.gn -@@ -166,8 +166,6 @@ component("gl") { +@@ -162,8 +162,6 @@ component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] } @@ -9,7 +9,7 @@ all_dependent_configs = [ ":gl_config" ] public_configs = [ "//third_party/khronos:khronos_headers" ] -@@ -184,7 +182,6 @@ component("gl") { +@@ -180,7 +178,6 @@ component("gl") { ] public_deps = [ "//base", @@ -17,7 +17,7 @@ "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -419,7 +416,6 @@ component("gl") { +@@ -391,7 +388,6 @@ component("gl") { data_deps += [ "//third_party/angle:libEGL", "//third_party/angle:libGLESv2", @@ -25,11 +25,11 @@ ] if (enable_swiftshader) { data_deps += [ -@@ -639,7 +635,6 @@ test("gl_unittests") { +@@ -607,7 +603,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", - "//third_party/mesa_headers", ] - # TODO(https://crbug.com/789065): this must be moved to Ozone. + if (is_win) { diff --git a/www/iridium/files/patch-ui_gl_generate__bindings.py b/www/iridium/files/patch-ui_gl_generate__bindings.py deleted file mode 100644 index 6e6b737bbb3a..000000000000 --- a/www/iridium/files/patch-ui_gl_generate__bindings.py +++ /dev/null @@ -1,12 +0,0 @@ ---- ui/gl/generate_bindings.py.orig 2023-01-17 19:19:00 UTC -+++ ui/gl/generate_bindings.py -@@ -2971,6 +2971,9 @@ GLX_FUNCTIONS = [ - 'arguments': - 'Display* dpy, GLXDrawable drawable, int32_t* numerator, ' - 'int32_t* denominator' }, -+{ 'return_type': '__GLXextFuncPtr', -+ 'names': ['glXGetProcAddressARB'], -+ 'arguments': 'const GLubyte* procName', }, - { 'return_type': 'void', - 'names': ['glXGetSelectedEvent'], - 'arguments': 'Display* dpy, GLXDrawable drawable, unsigned long* mask', }, diff --git a/www/iridium/files/patch-ui_gl_gl__bindings.h b/www/iridium/files/patch-ui_gl_gl__bindings.h new file mode 100644 index 000000000000..5eb87e1806fd --- /dev/null +++ b/www/iridium/files/patch-ui_gl_gl__bindings.h @@ -0,0 +1,11 @@ +--- ui/gl/gl_bindings.h.orig 2023-03-13 07:33:08 UTC ++++ ui/gl/gl_bindings.h +@@ -37,7 +37,7 @@ + #include <GL/wglext.h> + #elif BUILDFLAG(IS_APPLE) + #include <OpenGL/OpenGL.h> +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + using Display = struct _XDisplay; + using Bool = int; + using Status = int; diff --git a/www/iridium/files/patch-ui_gl_gl__bindings__api__autogen__glx.h b/www/iridium/files/patch-ui_gl_gl__bindings__api__autogen__glx.h deleted file mode 100644 index 31c3fc69e905..000000000000 --- a/www/iridium/files/patch-ui_gl_gl__bindings__api__autogen__glx.h +++ /dev/null @@ -1,10 +0,0 @@ ---- ui/gl/gl_bindings_api_autogen_glx.h.orig 2022-03-28 18:11:04 UTC -+++ ui/gl/gl_bindings_api_autogen_glx.h -@@ -88,6 +88,7 @@ bool glXGetMscRateOMLFn(Display* dpy, - GLXDrawable drawable, - int32_t* numerator, - int32_t* denominator) override; -+__GLXextFuncPtr glXGetProcAddressARBFn(const GLubyte* procName) override; - void glXGetSelectedEventFn(Display* dpy, - GLXDrawable drawable, - unsigned long* mask) override; diff --git a/www/iridium/files/patch-ui_gl_gl__bindings__autogen__glx.cc b/www/iridium/files/patch-ui_gl_gl__bindings__autogen__glx.cc deleted file mode 100644 index cee35ada491f..000000000000 --- a/www/iridium/files/patch-ui_gl_gl__bindings__autogen__glx.cc +++ /dev/null @@ -1,61 +0,0 @@ ---- ui/gl/gl_bindings_autogen_glx.cc.orig 2022-03-28 18:11:04 UTC -+++ ui/gl/gl_bindings_autogen_glx.cc -@@ -115,6 +115,8 @@ void DriverGLX::InitializeExtensionBindings() { - - ext.b_GLX_ARB_create_context = - gfx::HasExtension(extensions, "GLX_ARB_create_context"); -+ ext.b_GLX_ARB_get_proc_address = -+ gfx::HasExtension(extensions, "GLX_ARB_get_proc_address"); - ext.b_GLX_EXT_swap_control = - gfx::HasExtension(extensions, "GLX_EXT_swap_control"); - ext.b_GLX_EXT_texture_from_pixmap = -@@ -156,6 +158,11 @@ void DriverGLX::InitializeExtensionBindings() { - GetGLProcAddress("glXGetMscRateOML")); - } - -+ if (ext.b_GLX_ARB_get_proc_address) { -+ fn.glXGetProcAddressARBFn = reinterpret_cast<glXGetProcAddressARBProc>( -+ GetGLProcAddress("glXGetProcAddressARB")); -+ } -+ - if (ext.b_GLX_OML_sync_control) { - fn.glXGetSyncValuesOMLFn = reinterpret_cast<glXGetSyncValuesOMLProc>( - GetGLProcAddress("glXGetSyncValuesOML")); -@@ -346,6 +353,10 @@ bool GLXApiBase::glXGetMscRateOMLFn(Display* dpy, - return driver_->fn.glXGetMscRateOMLFn(dpy, drawable, numerator, denominator); - } - -+__GLXextFuncPtr GLXApiBase::glXGetProcAddressARBFn(const GLubyte* procName) { -+ return driver_->fn.glXGetProcAddressARBFn(procName); -+} -+ - void GLXApiBase::glXGetSelectedEventFn(Display* dpy, - GLXDrawable drawable, - unsigned long* mask) { -@@ -648,6 +659,11 @@ bool TraceGLXApi::glXGetMscRateOMLFn(Display* dpy, - return glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator); - } - -+__GLXextFuncPtr TraceGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) { -+ TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLXAPI::glXGetProcAddressARB") -+ return glx_api_->glXGetProcAddressARBFn(procName); -+} -+ - void TraceGLXApi::glXGetSelectedEventFn(Display* dpy, - GLXDrawable drawable, - unsigned long* mask) { -@@ -1069,6 +1085,14 @@ bool LogGLXApi::glXGetMscRateOMLFn(Display* dpy, - << static_cast<const void*>(denominator) << ")"); - bool result = - glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator); -+ GL_SERVICE_LOG("GL_RESULT: " << result); -+ return result; -+} -+ -+__GLXextFuncPtr LogGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) { -+ GL_SERVICE_LOG("glXGetProcAddressARB" -+ << "(" << static_cast<const void*>(procName) << ")"); -+ __GLXextFuncPtr result = glx_api_->glXGetProcAddressARBFn(procName); - GL_SERVICE_LOG("GL_RESULT: " << result); - return result; - } diff --git a/www/iridium/files/patch-ui_gl_gl__bindings__autogen__glx.h b/www/iridium/files/patch-ui_gl_gl__bindings__autogen__glx.h deleted file mode 100644 index bbce248e7366..000000000000 --- a/www/iridium/files/patch-ui_gl_gl__bindings__autogen__glx.h +++ /dev/null @@ -1,43 +0,0 @@ ---- ui/gl/gl_bindings_autogen_glx.h.orig 2022-03-28 18:11:04 UTC -+++ ui/gl/gl_bindings_autogen_glx.h -@@ -104,6 +104,8 @@ typedef bool(GL_BINDING_CALL* glXGetMscRateOMLProc)(Di - GLXDrawable drawable, - int32_t* numerator, - int32_t* denominator); -+typedef __GLXextFuncPtr(GL_BINDING_CALL* glXGetProcAddressARBProc)( -+ const GLubyte* procName); - typedef void(GL_BINDING_CALL* glXGetSelectedEventProc)(Display* dpy, - GLXDrawable drawable, - unsigned long* mask); -@@ -166,6 +168,7 @@ typedef void(GL_BINDING_CALL* glXWaitXProc)(void); - - struct ExtensionsGLX { - bool b_GLX_ARB_create_context; -+ bool b_GLX_ARB_get_proc_address; - bool b_GLX_EXT_swap_control; - bool b_GLX_EXT_texture_from_pixmap; - bool b_GLX_MESA_copy_sub_buffer; -@@ -203,6 +206,7 @@ struct ProcsGLX { - glXGetFBConfigFromVisualSGIXProc glXGetFBConfigFromVisualSGIXFn; - glXGetFBConfigsProc glXGetFBConfigsFn; - glXGetMscRateOMLProc glXGetMscRateOMLFn; -+ glXGetProcAddressARBProc glXGetProcAddressARBFn; - glXGetSelectedEventProc glXGetSelectedEventFn; - glXGetSyncValuesOMLProc glXGetSyncValuesOMLFn; - glXGetVisualFromFBConfigProc glXGetVisualFromFBConfigFn; -@@ -310,6 +314,7 @@ class GL_EXPORT GLXApi { - GLXDrawable drawable, - int32_t* numerator, - int32_t* denominator) = 0; -+ virtual __GLXextFuncPtr glXGetProcAddressARBFn(const GLubyte* procName) = 0; - virtual void glXGetSelectedEventFn(Display* dpy, - GLXDrawable drawable, - unsigned long* mask) = 0; -@@ -394,6 +399,7 @@ class GL_EXPORT GLXApi { - ::gl::g_current_glx_context->glXGetFBConfigFromVisualSGIXFn - #define glXGetFBConfigs ::gl::g_current_glx_context->glXGetFBConfigsFn - #define glXGetMscRateOML ::gl::g_current_glx_context->glXGetMscRateOMLFn -+#define glXGetProcAddressARB ::gl::g_current_glx_context->glXGetProcAddressARBFn - #define glXGetSelectedEvent ::gl::g_current_glx_context->glXGetSelectedEventFn - #define glXGetSyncValuesOML ::gl::g_current_glx_context->glXGetSyncValuesOMLFn - #define glXGetVisualFromFBConfig \ diff --git a/www/iridium/files/patch-ui_gl_gl__features.h b/www/iridium/files/patch-ui_gl_gl__features.h deleted file mode 100644 index 02483acd311f..000000000000 --- a/www/iridium/files/patch-ui_gl_gl__features.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/gl/gl_features.h.orig 2023-01-17 19:19:00 UTC -+++ ui/gl/gl_features.h -@@ -23,7 +23,7 @@ GL_EXPORT BASE_DECLARE_FEATURE(kAndroidFrameDeadline); - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #define PASSTHROUGH_COMMAND_DECODER_LAUNCHED - #else - // All features in alphabetical order. The features should be documented diff --git a/www/iridium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc b/www/iridium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc deleted file mode 100644 index 42e907b01d4f..000000000000 --- a/www/iridium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/gl/gl_image_glx_native_pixmap.cc.orig 2022-10-05 07:34:01 UTC -+++ ui/gl/gl_image_glx_native_pixmap.cc -@@ -12,6 +12,8 @@ - #include "ui/gl/buffer_format_utils.h" - #include "ui/gl/glx_util.h" - -+#include <unistd.h> -+ - namespace gl { - - GLImageGLXNativePixmap::GLImageGLXNativePixmap(const gfx::Size& size, diff --git a/www/iridium/files/patch-ui_gl_gl__implementation.cc b/www/iridium/files/patch-ui_gl_gl__implementation.cc index b3478dc17fd6..40ebefa4ebf3 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 2022-12-01 10:35:46 UTC +--- ui/gl/gl_implementation.cc.orig 2023-03-13 07:33:08 UTC +++ ui/gl/gl_implementation.cc -@@ -287,7 +287,7 @@ GetRequestedGLImplementationFromCommandLine( +@@ -292,7 +292,7 @@ GetRequestedGLImplementationFromCommandLine( *fallback_to_software_gl = false; bool overrideUseSoftwareGL = command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests); 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 2912f77482b0..a5ea974b4298 100644 --- a/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc +++ b/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc @@ -1,6 +1,6 @@ ---- ui/gtk/printing/print_dialog_gtk.cc.orig 2023-01-17 19:19:00 UTC +--- ui/gtk/printing/print_dialog_gtk.cc.orig 2023-03-13 07:33:08 UTC +++ ui/gtk/printing/print_dialog_gtk.cc -@@ -402,7 +402,7 @@ void PrintDialogGtk::ShowDialog( +@@ -403,7 +403,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_native__theme_native__theme__base.cc b/www/iridium/files/patch-ui_native__theme_native__theme__base.cc index c3a593a2a717..ca6857c494f8 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,6 +1,6 @@ ---- ui/native_theme/native_theme_base.cc.orig 2023-01-17 19:19:00 UTC +--- ui/native_theme/native_theme_base.cc.orig 2023-03-13 07:33:08 UTC +++ ui/native_theme/native_theme_base.cc -@@ -272,7 +272,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -273,7 +273,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, break; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 c59de19a3de7..de0bb621e577 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 2022-10-05 07:34:01 UTC +--- ui/ozone/platform/headless/headless_surface_factory.cc.orig 2023-03-13 07:33:08 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 -@@ -282,7 +282,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_wayland_host_wayland__toplevel__window.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc new file mode 100644 index 000000000000..2ae60f98d159 --- /dev/null +++ b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc @@ -0,0 +1,11 @@ +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2023-03-13 07:33:08 UTC ++++ ui/ozone/platform/wayland/host/wayland_toplevel_window.cc +@@ -446,7 +446,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur + const bool did_active_change = is_active_ != window_states.is_activated; + is_active_ = window_states.is_activated; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // 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 new file mode 100644 index 000000000000..ee7abd589b2a --- /dev/null +++ b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h @@ -0,0 +1,11 @@ +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2023-03-13 07:33:08 UTC ++++ ui/ozone/platform/wayland/host/wayland_toplevel_window.h +@@ -250,7 +250,7 @@ class WaylandToplevelWindow : public WaylandWindow, + // Contains the previous state of the window. + PlatformWindowState previous_state_ = PlatformWindowState::kUnknown; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // Contains the current state of the tiled edges. + WindowTiledEdges tiled_state_; + #endif diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h new file mode 100644 index 000000000000..f2cc476492b7 --- /dev/null +++ b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h @@ -0,0 +1,11 @@ +--- ui/ozone/platform/wayland/host/wayland_window.h.orig 2023-03-13 07:33:08 UTC ++++ ui/ozone/platform/wayland/host/wayland_window.h +@@ -231,7 +231,7 @@ class WaylandWindow : public PlatformWindow, + bool is_snapped_primary = false; + bool is_snapped_secondary = false; + bool is_floated = false; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + WindowTiledEdges tiled_edges; + #endif + }; 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 new file mode 100644 index 000000000000..b3a07985a17f --- /dev/null +++ b/www/iridium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc @@ -0,0 +1,11 @@ +--- ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig 2023-03-13 07:33:08 UTC ++++ ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc +@@ -269,7 +269,7 @@ void XDGToplevelWrapperImpl::ConfigureTopLevel( + CheckIfWlArrayHasValue(states, XDG_TOPLEVEL_STATE_ACTIVATED), + }; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + if (xdg_toplevel_get_version(xdg_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 new file mode 100644 index 000000000000..9edd54d34335 --- /dev/null +++ b/www/iridium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc @@ -0,0 +1,29 @@ +--- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2023-03-13 07:33:08 UTC ++++ ui/ozone/platform/wayland/ozone_platform_wayland.cc +@@ -71,7 +71,7 @@ + #include "ui/ozone/platform/wayland/host/wayland_cursor_factory.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/ozone/platform/wayland/host/linux_ui_delegate_wayland.h" + #endif + +@@ -246,7 +246,7 @@ class OzonePlatformWayland : public OzonePlatform, + + supported_buffer_formats_ = + connection_->buffer_manager_host()->GetSupportedBufferFormats(); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + linux_ui_delegate_ = + std::make_unique<LinuxUiDelegateWayland>(connection_.get()); + #endif +@@ -469,7 +469,7 @@ class OzonePlatformWayland : public OzonePlatform, + DrmRenderNodePathFinder path_finder_; + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::unique_ptr<LinuxUiDelegateWayland> linux_ui_delegate_; + #endif + }; diff --git a/www/iridium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc b/www/iridium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc index 3513bb1ce704..0ef90f68b935 100644 --- a/www/iridium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc +++ b/www/iridium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2022-12-06 08:09:13 UTC +--- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2023-03-13 07:33:08 UTC +++ ui/ozone/platform/x11/ozone_platform_x11.cc -@@ -195,7 +195,7 @@ class OzonePlatformX11 : public OzonePlatform, +@@ -196,7 +196,7 @@ class OzonePlatformX11 : public OzonePlatform, properties->supports_global_application_menus = true; properties->app_modal_dialogs_use_event_blocker = true; properties->fetch_buffer_formats_for_gmb_on_gpu = true; 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 a68d36812c0d..7e3bd812c6a2 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 2022-12-06 08:09:13 UTC +--- ui/platform_window/platform_window_delegate.h.orig 2023-03-13 07:33:08 UTC +++ ui/platform_window/platform_window_delegate.h -@@ -96,7 +96,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow +@@ -103,7 +103,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_textfield_textfield.cc b/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc index 75a8b1ccb0c5..dba45031b3ca 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 2023-01-17 19:19:00 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2023-03-13 07:33:08 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -71,7 +71,7 @@ +@@ -72,7 +72,7 @@ #include "base/win/win_util.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/linux/linux_ui.h" #endif -@@ -164,7 +164,7 @@ bool IsControlKeyModifier(int flags) { +@@ -166,7 +166,7 @@ bool IsControlKeyModifier(int flags) { // Control-modified key combination, but we cannot extend it to other platforms // as Control has different meanings and behaviors. // https://crrev.com/2580483002/#msg46 @@ -18,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -706,7 +706,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -703,7 +703,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -27,7 +27,7 @@ auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; if (!handled && linux_ui && -@@ -850,7 +850,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -847,7 +847,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; -@@ -1720,7 +1720,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1740,7 +1740,7 @@ bool Textfield::ShouldDoLearning() { return false; } @@ -45,7 +45,7 @@ // TODO(https://crbug.com/952355): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2231,14 +2231,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2254,14 +2254,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } diff --git a/www/iridium/files/patch-ui_views_controls_textfield_textfield.h b/www/iridium/files/patch-ui_views_controls_textfield_textfield.h index de1f625a6827..a4f9c2927f0a 100644 --- a/www/iridium/files/patch-ui_views_controls_textfield_textfield.h +++ b/www/iridium/files/patch-ui_views_controls_textfield_textfield.h @@ -1,4 +1,4 @@ ---- ui/views/controls/textfield/textfield.h.orig 2022-12-06 08:09:13 UTC +--- ui/views/controls/textfield/textfield.h.orig 2023-03-13 07:33:08 UTC +++ ui/views/controls/textfield/textfield.h @@ -42,7 +42,7 @@ #include "ui/views/view.h" @@ -9,7 +9,7 @@ #include <vector> #endif -@@ -448,7 +448,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -450,7 +450,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 fd94363f498a..0018471bff5a 100644 --- a/www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc +++ b/www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc @@ -1,6 +1,6 @@ ---- ui/views/corewm/tooltip_aura.cc.orig 2022-12-06 08:09:13 UTC +--- ui/views/corewm/tooltip_aura.cc.orig 2023-03-13 07:33:08 UTC +++ ui/views/corewm/tooltip_aura.cc -@@ -53,7 +53,7 @@ constexpr int kVerticalPaddingBottom = 5; +@@ -51,7 +51,7 @@ constexpr int kVerticalPaddingBottom = 5; bool CanUseTranslucentTooltipWidget() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 ceb30a2afc00..2172d3a33be8 100644 --- a/www/iridium/files/patch-ui_views_style_platform__style.cc +++ b/www/iridium/files/patch-ui_views_style_platform__style.cc @@ -1,4 +1,4 @@ ---- ui/views/style/platform_style.cc.orig 2022-10-05 07:34:01 UTC +--- ui/views/style/platform_style.cc.orig 2023-03-13 07:33:08 UTC +++ ui/views/style/platform_style.cc @@ -17,7 +17,7 @@ #include "ui/views/controls/focusable_border.h" @@ -9,16 +9,16 @@ #include "ui/views/controls/scrollbar/overlay_scroll_bar.h" #endif -@@ -52,7 +52,7 @@ const View::FocusBehavior PlatformStyle::kDefaultFocus +@@ -50,7 +50,7 @@ const View::FocusBehavior PlatformStyle::kDefaultFocus + // Linux clips bubble windows that extend outside their parent window + // bounds. const bool PlatformStyle::kAdjustBubbleIfOffscreen = - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) false; #else true; -@@ -60,7 +60,7 @@ const bool PlatformStyle::kAdjustBubbleIfOffscreen = +@@ -58,7 +58,7 @@ const bool PlatformStyle::kAdjustBubbleIfOffscreen = // static std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) { 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 2b486af7d68c..ba5ae1175d24 100644 --- a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2023-01-17 19:19:00 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2023-03-13 07:33:08 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -41,7 +41,7 @@ +@@ -43,7 +43,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 -@@ -257,7 +257,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget: +@@ -259,7 +259,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget: if (params.type == Widget::InitParams::TYPE_WINDOW) GetContentWindow()->SetProperty(aura::client::kAnimationsDisabledKey, true); @@ -18,7 +18,7 @@ const bool requires_accelerated_widget = params.requires_accelerated_widget; #else const bool requires_accelerated_widget = false; -@@ -329,7 +329,7 @@ std::unique_ptr<aura::client::DragDropClient> +@@ -331,7 +331,7 @@ std::unique_ptr<aura::client::DragDropClient> DesktopWindowTreeHostPlatform::CreateDragDropClient() { ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window())); std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client = @@ -27,7 +27,7 @@ std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler); #else std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler); -@@ -1018,7 +1018,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis +@@ -1041,7 +1041,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc index fea64165f6de..24b06760e3f1 100644 --- a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc +++ b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc.orig 2022-10-05 07:34:01 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc.orig 2023-03-13 07:33:08 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc -@@ -22,7 +22,7 @@ +@@ -21,7 +21,7 @@ #include "ui/views/widget/widget_delegate.h" #include "ui/views/window/native_frame_view.h" diff --git a/www/iridium/files/patch-ui_views_window_dialog__delegate.cc b/www/iridium/files/patch-ui_views_window_dialog__delegate.cc index ba38f781755b..392c9a91ec84 100644 --- a/www/iridium/files/patch-ui_views_window_dialog__delegate.cc +++ b/www/iridium/files/patch-ui_views_window_dialog__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/window/dialog_delegate.cc.orig 2022-10-05 07:34:01 UTC +--- ui/views/window/dialog_delegate.cc.orig 2023-03-13 07:33:08 UTC +++ ui/views/window/dialog_delegate.cc -@@ -79,7 +79,7 @@ Widget* DialogDelegate::CreateDialogWidget( +@@ -73,7 +73,7 @@ Widget* DialogDelegate::CreateDialogWidget( // static bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) { diff --git a/www/iridium/files/patch-v8_BUILD.gn b/www/iridium/files/patch-v8_BUILD.gn index 14c851a41358..43fcbc4aba89 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 2023-01-17 19:19:00 UTC +--- v8/BUILD.gn.orig 2023-03-13 07:33:08 UTC +++ v8/BUILD.gn -@@ -1242,6 +1242,14 @@ config("toolchain") { +@@ -1299,6 +1299,14 @@ config("toolchain") { } else if (target_os == "win") { defines += [ "V8_HAVE_TARGET_OS" ] defines += [ "V8_TARGET_OS_WIN" ] @@ -15,7 +15,7 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -5500,7 +5508,7 @@ v8_component("v8_libbase") { +@@ -5702,7 +5710,7 @@ v8_component("v8_libbase") { } } @@ -24,7 +24,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -5511,6 +5519,18 @@ v8_component("v8_libbase") { +@@ -5713,6 +5721,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/iridium/files/patch-v8_src_api_api.cc b/www/iridium/files/patch-v8_src_api_api.cc index 23bb6858a87d..302994de9e3a 100644 --- a/www/iridium/files/patch-v8_src_api_api.cc +++ b/www/iridium/files/patch-v8_src_api_api.cc @@ -1,4 +1,4 @@ ---- v8/src/api/api.cc.orig 2023-01-17 19:19:00 UTC +--- v8/src/api/api.cc.orig 2023-03-13 07:33:08 UTC +++ v8/src/api/api.cc @@ -141,7 +141,7 @@ #include "src/wasm/wasm-serialization.h" @@ -9,7 +9,7 @@ #include <signal.h> #if V8_ENABLE_WEBASSEMBLY -@@ -6210,7 +6210,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6364,7 +6364,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/iridium/files/patch-v8_src_base_platform_memory.h b/www/iridium/files/patch-v8_src_base_platform_memory.h index 507555cc1dab..b7b0346eda33 100644 --- a/www/iridium/files/patch-v8_src_base_platform_memory.h +++ b/www/iridium/files/patch-v8_src_base_platform_memory.h @@ -1,16 +1,16 @@ ---- v8/src/base/platform/memory.h.orig 2022-12-01 10:35:46 UTC +--- v8/src/base/platform/memory.h.orig 2023-03-13 07:33:08 UTC +++ v8/src/base/platform/memory.h @@ -19,11 +19,11 @@ #if V8_OS_DARWIN #include <malloc/malloc.h> -#else // !V8_OS_DARWIN -+#elif !V8_OS_BSD // !V8_OS_DARWIN ++#elif !V8_OS_BSD #include <malloc.h> #endif // !V8_OS_DARWIN --#if (V8_OS_POSIX && !V8_OS_AIX) || V8_OS_WIN -+#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_BSD) || V8_OS_WIN +-#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS) || V8_OS_WIN ++#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS && !V8_OS_BSD) || V8_OS_WIN #define V8_HAS_MALLOC_USABLE_SIZE 1 - #endif // (V8_OS_POSIX && !V8_OS_AIX) || V8_OS_WIN + #endif // (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS) || V8_OS_WIN diff --git a/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc b/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc index d6133de5246b..7800c5cabe49 100644 --- a/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,4 +1,4 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2022-12-01 10:35:46 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2023-03-13 07:33:08 UTC +++ v8/src/base/platform/platform-posix.cc @@ -53,7 +53,7 @@ #if V8_OS_DARWIN @@ -42,7 +42,7 @@ // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files. #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA -@@ -650,7 +658,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor +@@ -661,7 +669,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor // static bool OS::HasLazyCommits() { @@ -51,7 +51,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1227,7 +1235,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1238,7 +1246,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* // keep this version in POSIX as most Linux-compatible derivatives will // support it. MacOS and FreeBSD are different here. #if !defined(V8_OS_FREEBSD) && !defined(V8_OS_DARWIN) && !defined(_AIX) && \ diff --git a/www/iridium/files/patch-v8_src_execution_isolate.cc b/www/iridium/files/patch-v8_src_execution_isolate.cc new file mode 100644 index 000000000000..971f3f4c12cf --- /dev/null +++ b/www/iridium/files/patch-v8_src_execution_isolate.cc @@ -0,0 +1,25 @@ +--- v8/src/execution/isolate.cc.orig 2023-03-13 07:33:08 UTC ++++ v8/src/execution/isolate.cc +@@ -146,6 +146,10 @@ + #include "src/execution/simulator-base.h" + #endif + ++#if defined(V8_OS_OPENBSD) ++#include <sys/mman.h> ++#endif ++ + 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_[]; +@@ -3924,6 +3928,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { + uint32_t code_size = DefaultEmbeddedBlobCodeSize(); + const uint8_t* data = DefaultEmbeddedBlobData(); + uint32_t data_size = DefaultEmbeddedBlobDataSize(); ++ ++#if defined(V8_OS_OPENBSD) ++ mprotect(reinterpret_cast<void *>(const_cast<uint8_t *>(code)), ++ code_size, PROT_READ | PROT_EXEC); ++#endif + + if (StickyEmbeddedBlobCode() != nullptr) { + base::MutexGuard guard(current_embedded_blob_refcount_mutex_.Pointer()); diff --git a/www/iridium/files/patch-v8_src_flags_flags.cc b/www/iridium/files/patch-v8_src_flags_flags.cc deleted file mode 100644 index 853da2a1837e..000000000000 --- a/www/iridium/files/patch-v8_src_flags_flags.cc +++ /dev/null @@ -1,26 +0,0 @@ ---- v8/src/flags/flags.cc.orig 2023-01-17 19:19:00 UTC -+++ v8/src/flags/flags.cc -@@ -31,7 +31,12 @@ - namespace v8::internal { - - // Define {v8_flags}, declared in flags.h. -+#if V8_OS_OPENBSD -+#include <sys/mman.h> -+FlagValues v8_flags __attribute__((section(".openbsd.mutable"))); -+#else - FlagValues v8_flags; -+#endif - - // {v8_flags} needs to be aligned to a memory page, and the size needs to be a - // multiple of a page size. This is required for memory-protection of the memory -@@ -787,6 +792,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)); -+#if V8_OS_OPENBSD -+ if (mimmutable(&v8_flags, sizeof(v8_flags)) == -1) -+ FATAL("unable to set immutability of v8_flags"); -+#endif - } - - // static diff --git a/www/iridium/files/patch-v8_src_sandbox_sandbox.cc b/www/iridium/files/patch-v8_src_sandbox_sandbox.cc index 1a33b2904aa0..1c832820b516 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 2022-10-05 07:34:01 UTC +--- v8/src/sandbox/sandbox.cc.orig 2023-03-13 07:33:08 UTC +++ v8/src/sandbox/sandbox.cc -@@ -49,7 +49,7 @@ static Address DetermineAddressSpaceLimit() { +@@ -46,7 +46,7 @@ static Address DetermineAddressSpaceLimit() { } #endif // V8_TARGET_ARCH_X64 diff --git a/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc b/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc new file mode 100644 index 000000000000..8e6d56b7ae79 --- /dev/null +++ b/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc @@ -0,0 +1,11 @@ +--- v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc.orig 2023-03-13 07:33:08 UTC ++++ v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc +@@ -142,6 +142,8 @@ EmbeddedTargetOs ToEmbeddedTargetOs(const char* s) { + return EmbeddedTargetOs::kWin; + } else if (string == "starboard") { + return EmbeddedTargetOs::kStarboard; ++ } else if (string == "openbsd") { ++ return EmbeddedTargetOs::kOpenBSD; + } else { + return EmbeddedTargetOs::kGeneric; + } diff --git a/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h b/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h new file mode 100644 index 000000000000..40f5b69a2321 --- /dev/null +++ b/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h @@ -0,0 +1,10 @@ +--- v8/src/snapshot/embedded/platform-embedded-file-writer-base.h.orig 2023-03-13 07:33:08 UTC ++++ v8/src/snapshot/embedded/platform-embedded-file-writer-base.h +@@ -31,6 +31,7 @@ enum class EmbeddedTargetOs { + kMac, + kWin, + kStarboard, ++ kOpenBSD, + kGeneric, // Everything not covered above falls in here. + }; + diff --git a/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc b/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc new file mode 100644 index 000000000000..9a1155f1fd26 --- /dev/null +++ b/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc @@ -0,0 +1,40 @@ +--- v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc.orig 2023-03-13 07:33:08 UTC ++++ v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc +@@ -9,6 +9,10 @@ + + #include "src/objects/code.h" + ++#if V8_OS_OPENBSD ++#include <sys/param.h> ++#endif ++ + namespace v8 { + namespace internal { + +@@ -35,6 +39,8 @@ const char* DirectiveAsString(DataDirective directive) + void PlatformEmbeddedFileWriterGeneric::SectionText() { + if (target_os_ == EmbeddedTargetOs::kChromeOS) { + fprintf(fp_, ".section .text.hot.embedded\n"); ++ } else if (target_os_ == EmbeddedTargetOs::kOpenBSD) { ++ fprintf(fp_, ".section .openbsd.mutable,\"a\"\n"); + } else { + fprintf(fp_, ".section .text\n"); + } +@@ -66,6 +72,8 @@ void PlatformEmbeddedFileWriterGeneric::AlignToCodeAli + // On these architectures and platforms, we remap the builtins, so need these + // to be aligned on a page boundary. + fprintf(fp_, ".balign 4096\n"); ++#elif V8_OS_OPENBSD ++ fprintf(fp_, ".balign %d\n", PAGE_SIZE); + #elif V8_TARGET_ARCH_X64 + // On x64 use 64-bytes code alignment to allow 64-bytes loop header alignment. + static_assert(64 >= kCodeAlignment); +@@ -86,6 +94,8 @@ void PlatformEmbeddedFileWriterGeneric::AlignToPageSiz + (V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_ARM64) + // Since the builtins are remapped, need to pad until the next page boundary. + fprintf(fp_, ".balign 4096\n"); ++#elif V8_OS_OPENBSD ++ fprintf(fp_, ".balign %d\n", PAGE_SIZE); + #endif + } + diff --git a/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.cc b/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.cc index 4fa19220d799..ad33b385b8be 100644 --- a/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.cc +++ b/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.cc @@ -1,4 +1,4 @@ ---- weblayer/browser/content_browser_client_impl.cc.orig 2023-01-17 19:19:00 UTC +--- weblayer/browser/content_browser_client_impl.cc.orig 2023-03-13 07:33:08 UTC +++ weblayer/browser/content_browser_client_impl.cc @@ -155,7 +155,7 @@ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is @@ -9,7 +9,7 @@ #include "content/public/common/content_descriptors.h" #endif -@@ -1004,7 +1004,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe +@@ -1006,7 +1006,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/iridium/pkg-plist b/www/iridium/pkg-plist index 3cb2d6e97f32..c8b76d0036e1 100644 --- a/www/iridium/pkg-plist +++ b/www/iridium/pkg-plist @@ -2,6 +2,7 @@ bin/iridium %%DATADIR%%/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 |